diff --git a/archive/java/resonantinduction/mechanical/ClientProxy.java b/archive/java/resonantinduction/mechanical/ClientProxy.java index 146f7d9f5..5193562c1 100644 --- a/archive/java/resonantinduction/mechanical/ClientProxy.java +++ b/archive/java/resonantinduction/mechanical/ClientProxy.java @@ -1,6 +1,5 @@ package resonantinduction.mechanical; -import mechanical.CommonProxy; import resonantinduction.mechanical.render.MechanicalBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/archive/java/resonantinduction/mechanical/Mechanical.java b/archive/java/resonantinduction/mechanical/Mechanical.java index db99b7faa..b3c6eff51 100644 --- a/archive/java/resonantinduction/mechanical/Mechanical.java +++ b/archive/java/resonantinduction/mechanical/Mechanical.java @@ -1,11 +1,10 @@ package resonantinduction.mechanical; -import mechanical.CommonProxy; import net.minecraft.block.Block; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.Settings; -import mechanical.belt.BlockConveyorBelt; +import resonantinduction.mechanical.belt.BlockConveyorBelt; import resonantinduction.old.core.recipe.RecipeLoader; import resonantinduction.old.transport.ResonantInductionTransport; import calclavia.lib.network.PacketHandler; diff --git a/archive/java/resonantinduction/mechanical/belt/BlockConveyorBelt.java b/archive/java/resonantinduction/mechanical/belt/BlockConveyorBelt.java index d21cd7379..b681c2c42 100644 --- a/archive/java/resonantinduction/mechanical/belt/BlockConveyorBelt.java +++ b/archive/java/resonantinduction/mechanical/belt/BlockConveyorBelt.java @@ -3,8 +3,6 @@ package resonantinduction.mechanical.belt; import java.util.List; import java.util.Set; -import mechanical.belt.RenderConveyorBelt; -import mechanical.belt.TileConveyorBelt; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -20,7 +18,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.ForgeDirection; import resonantinduction.core.prefab.block.BlockMachine; -import mechanical.belt.TileConveyorBelt.SlantType; +import resonantinduction.mechanical.belt.TileConveyorBelt.SlantType; import resonantinduction.mechanical.render.MechanicalBlockRenderingHandler; import resonantinduction.old.client.render.RenderConveyorBelt; diff --git a/archive/java/resonantinduction/mechanical/render/MechanicalBlockRenderingHandler.java b/archive/java/resonantinduction/mechanical/render/MechanicalBlockRenderingHandler.java index 50bb2e3ec..2731106aa 100644 --- a/archive/java/resonantinduction/mechanical/render/MechanicalBlockRenderingHandler.java +++ b/archive/java/resonantinduction/mechanical/render/MechanicalBlockRenderingHandler.java @@ -8,7 +8,7 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; import resonantinduction.core.Reference; -import mechanical.Mechanical; +import resonantinduction.mechanical.Mechanical; import resonantinduction.old.client.model.ModelConveyorBelt; import resonantinduction.old.client.model.ModelCrusher; import resonantinduction.old.client.model.ModelGrinder; diff --git a/archive/java/resonantinduction/old/client/gui/GuiEncoderBase.java b/archive/java/resonantinduction/old/client/gui/GuiEncoderBase.java index 2c1e9d4e3..a893a41d6 100644 --- a/archive/java/resonantinduction/old/client/gui/GuiEncoderBase.java +++ b/archive/java/resonantinduction/old/client/gui/GuiEncoderBase.java @@ -3,7 +3,7 @@ package resonantinduction.old.client.gui; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import resonantinduction.core.prefab.tile.TileEntityMachine; -import mechanical.CommonProxy; +import resonantinduction.mechanical.CommonProxy; import resonantinduction.old.transport.ResonantInductionTransport; import dark.lib.prefab.invgui.ContainerFake; import dark.lib.prefab.invgui.GuiMachineContainer; diff --git a/archive/java/resonantinduction/old/client/render/BlockRenderHelper.java b/archive/java/resonantinduction/old/client/render/BlockRenderHelper.java index 6626ed185..76a699bd3 100644 --- a/archive/java/resonantinduction/old/client/render/BlockRenderHelper.java +++ b/archive/java/resonantinduction/old/client/render/BlockRenderHelper.java @@ -55,7 +55,7 @@ public class BlockRenderHelper implements ISimpleBlockRenderingHandler { GL11.glTranslatef(0.0F, 1.5F, 0.0F); GL11.glRotatef(180f, 0f, 0f, 1f); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(Reference.DOMAIN, Reference.MODEL_DIRECTORY + "mechanical/GearRod.png")); + FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(Reference.DOMAIN, Reference.MODEL_DIRECTORY + "resonantinduction/mechanical/GearRod.png")); modelRod.render(0.0825F, 0); } else if (RecipeLoader.blockConPump != null && block.blockID == RecipeLoader.blockConPump.blockID && metadata < 4) diff --git a/archive/java/resonantinduction/old/client/render/RenderConveyorBelt.java b/archive/java/resonantinduction/old/client/render/RenderConveyorBelt.java index a7f30d235..802b5cf8a 100644 --- a/archive/java/resonantinduction/old/client/render/RenderConveyorBelt.java +++ b/archive/java/resonantinduction/old/client/render/RenderConveyorBelt.java @@ -7,8 +7,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import resonantinduction.core.Reference; -import mechanical.belt.TileConveyorBelt; -import mechanical.belt.TileConveyorBelt.SlantType; +import resonantinduction.mechanical.belt.TileConveyorBelt; +import resonantinduction.mechanical.belt.TileConveyorBelt.SlantType; import resonantinduction.old.client.model.ModelAngledBelt; import resonantinduction.old.client.model.ModelConveyorBelt; import cpw.mods.fml.relauncher.Side; diff --git a/archive/java/resonantinduction/old/client/render/RenderGearRod.java b/archive/java/resonantinduction/old/client/render/RenderGearRod.java index 56f8a14e1..f2cd6c461 100644 --- a/archive/java/resonantinduction/old/client/render/RenderGearRod.java +++ b/archive/java/resonantinduction/old/client/render/RenderGearRod.java @@ -21,7 +21,7 @@ public class RenderGearRod extends TileEntitySpecialRenderer public void renderAModelAt(TileEntity tileEntity, double d, double d1, double d2, float f) { - // bindTextureByName(FluidMech.MODEL_TEXTURE_DIRECTORY + "mechanical/GearRod.png"); + // bindTextureByName(FluidMech.MODEL_TEXTURE_DIRECTORY + "resonantinduction.mechanical/GearRod.png"); GL11.glPushMatrix(); int meta = tileEntity.worldObj.getBlockMetadata(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord); diff --git a/archive/java/resonantinduction/old/client/render/RenderGenerator.java b/archive/java/resonantinduction/old/client/render/RenderGenerator.java index b7bcaabce..3a7c5cfd2 100644 --- a/archive/java/resonantinduction/old/client/render/RenderGenerator.java +++ b/archive/java/resonantinduction/old/client/render/RenderGenerator.java @@ -23,7 +23,7 @@ public class RenderGenerator extends TileEntitySpecialRenderer @Override public void renderTileEntityAt(TileEntity tileEntity, double d, double d1, double d2, float d3) { - // bindTextureByName(FluidMech.MODEL_TEXTURE_DIRECTORY + "mechanical/Generator.png"); + // bindTextureByName(FluidMech.MODEL_TEXTURE_DIRECTORY + "resonantinduction.mechanical/Generator.png"); GL11.glPushMatrix(); GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.45F, (float) d2 + 0.5F); GL11.glScalef(1.0F, -1F, -1F); diff --git a/archive/java/resonantinduction/old/mechanics/processor/BlockProcessor.java b/archive/java/resonantinduction/old/mechanics/processor/BlockProcessor.java index dd000ae9f..fd910b39b 100644 --- a/archive/java/resonantinduction/old/mechanics/processor/BlockProcessor.java +++ b/archive/java/resonantinduction/old/mechanics/processor/BlockProcessor.java @@ -14,7 +14,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.Configuration; import net.minecraftforge.oredict.OreDictionary; import resonantinduction.core.prefab.block.BlockMachine; -import mechanical.CommonProxy; +import resonantinduction.mechanical.CommonProxy; import resonantinduction.old.client.render.MechanicalBlockRenderingHandler; import resonantinduction.old.client.render.RenderProcessor; import resonantinduction.old.transport.ResonantInductionTransport; diff --git a/archive/java/resonantinduction/old/transport/encoder/BlockEncoder.java b/archive/java/resonantinduction/old/transport/encoder/BlockEncoder.java index d90508aec..429035e14 100644 --- a/archive/java/resonantinduction/old/transport/encoder/BlockEncoder.java +++ b/archive/java/resonantinduction/old/transport/encoder/BlockEncoder.java @@ -12,7 +12,7 @@ import net.minecraft.world.World; import resonantinduction.core.Reference; import resonantinduction.core.Settings; import resonantinduction.core.prefab.block.BlockMachine; -import mechanical.CommonProxy; +import resonantinduction.mechanical.CommonProxy; import resonantinduction.old.transport.ResonantInductionTransport; import com.builtbroken.common.Pair; diff --git a/settings.gradle b/settings.gradle index a73936ab5..506f294fe 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ rootProject.name = 'Resonant-Induction Core' -include 'archaic', 'mechanical', 'electrical', 'atomic' \ No newline at end of file +include 'archaic', 'resonantinduction.mechanical', 'electrical', 'atomic' \ No newline at end of file diff --git a/src/main/scala/resonantinduction/archaic/blocks/TileTurntable.scala b/src/main/scala/resonantinduction/archaic/blocks/TileTurntable.scala index b71bdbe0c..51e2137d7 100644 --- a/src/main/scala/resonantinduction/archaic/blocks/TileTurntable.scala +++ b/src/main/scala/resonantinduction/archaic/blocks/TileTurntable.scala @@ -1,101 +1,105 @@ package resonantinduction.archaic.blocks import codechicken.multipart.TileMultipart -import cpw.mods.fml.relauncher.SideOnly -import net.minecraft.block.Block +import cpw.mods.fml.relauncher.{Side, SideOnly} import net.minecraft.block.material.Material -import net.minecraft.client.renderer.texture.IconRegister -import net.minecraft.tileentity.TileEntity -import net.minecraft.util.Icon -import net.minecraft.world.IBlockAccess -import net.minecraft.world.World -import net.minecraftforge.common.ForgeDirection +import net.minecraft.client.renderer.texture.IIconRegister +import net.minecraft.util.IIcon +import net.minecraft.world.{IBlockAccess, World} +import net.minecraftforge.common.util.ForgeDirection import resonant.api.IRotatable -import resonant.api.blocks.IRotatableBlock -import resonant.api.blocks.IRotatableBlock -import resonant.lib.content.module.TileBlock -import resonant.lib.content.module.TileRender -import resonant.lib.render.RotatedTextureRenderer +import resonant.content.prefab.RenderRotatedTexture +import resonant.content.spatial.block.SpatialBlock +import resonant.lib.content.prefab.TRotatable import resonantinduction.core.Reference -import universalelectricity.api.vector.Vector3 -import cpw.mods.fml.relauncher.Side +import universalelectricity.core.transform.vector.Vector3 -class TileTurntable extends TileBlock(Material.piston) with IRotatable { +object TileTurntable +{ + var top: IIcon = null +} + +class TileTurntable extends SpatialBlock(Material.piston) with TRotatable with RenderRotatedTexture +{ textureName = "turntable_side" tickRandomly = true rotationMask = Integer.parseInt("111111", 2).toByte - override def tickRate(par1World: World): Int = - { - return 5 - } + override def tickRate(par1World: World): Int = 5 - @SideOnly(Side.CLIENT) override def registerIcons(iconReg: IconRegister) { + @SideOnly(Side.CLIENT) + override def registerIcons(iconReg: IIconRegister) + { super.registerIcons(iconReg) TileTurntable.top = iconReg.registerIcon(Reference.PREFIX + "turntable") } - override def updateEntity() { + override def updateEntity() + { updateTurntableState(world, x, y, z) } - @SideOnly(Side.CLIENT) override def getIcon(access: IBlockAccess, side: Int): Icon = + @SideOnly(Side.CLIENT) + override def getIcon(access: IBlockAccess, side: Int): IIcon = + { + if (side == metadata) { - if (side == super.metadata()) { - return TileTurntable.top - } - - return getIcon + return TileTurntable.top } - @SideOnly(Side.CLIENT) override def getIcon(side: Int, meta: Int): Icon = - { - if (side == 1) { - return TileTurntable.top - } - return getIcon - } - - override def onNeighborChanged() { - scheduelTick(10) + return getIcon } - private def updateTurntableState(world: World, x: Int, y: Int, z: Int) { - if (world.isBlockIndirectlyGettingPowered(x, y, z)) { - try { + @SideOnly(Side.CLIENT) + override def getIcon(side: Int, meta: Int): IIcon = + { + if (side == 1) + { + return TileTurntable.top + } + return getIcon + } + + override def onNeighborChanged() + { + scheduleTick(10) + } + + private def updateTurntableState(world: World, x: Int, y: Int, z: Int) + { + if (world.isBlockIndirectlyGettingPowered(x, y, z)) + { + try + { val facing: ForgeDirection = ForgeDirection.getOrientation(world.getBlockMetadata(x, y, z)) - val position: Vector3 = new Vector3(x, y, z).translate(facing) - val tileEntity: TileEntity = position.getTileEntity(world) - val block: Block = Block.blocksList(position.getBlockID(world)) - if (!(tileEntity.isInstanceOf[TileMultipart])) { - if (tileEntity.isInstanceOf[IRotatable]) { - val blockRotation: ForgeDirection = (tileEntity.asInstanceOf[IRotatable]).getDirection - (tileEntity.asInstanceOf[IRotatable]).setDirection(blockRotation.getRotation(facing.getOpposite)) - } else if (block.isInstanceOf[IRotatableBlock]) { - val blockRotation: ForgeDirection = (block.asInstanceOf[IRotatableBlock]).getDirection(world, position.intX, position.intY, position.intZ) - (block.asInstanceOf[IRotatableBlock]).setDirection(world, position.intX, position.intY, position.intZ, blockRotation.getRotation(facing.getOpposite)) - } else if (block != null) { - Block.blocksList(blockID).rotateBlock(world, position.intX, position.intY, position.intZ, facing.getOpposite) + val position = new Vector3(x, y, z) + facing + val tileEntity = position.getTileEntity(world) + val block = position.getBlock(world) + + if (!(tileEntity.isInstanceOf[TileMultipart])) + { + if (tileEntity.isInstanceOf[IRotatable]) + { + val blockRotation = tileEntity.asInstanceOf[IRotatable].getDirection + tileEntity.asInstanceOf[IRotatable].setDirection(blockRotation.getRotation(facing.getOpposite)) } + else if (block != null) + { + block.rotateBlock(world, position.intX, position.intY, position.intZ, facing.getOpposite) + } + world.markBlockForUpdate(position.intX, position.intY, position.intZ) world.playSoundEffect(x + 0.5D, y + 0.5D, z + 0.5D, "tile.piston.in", 0.5F, world.rand.nextFloat * 0.15F + 0.6F) } - } catch { - case e: Exception => + } + catch + { + case e: Exception => { System.out.println("Error while rotating a block near " + x + "x " + y + "y " + z + "z " + (if (world != null && world.provider != null) world.provider.dimensionId + "d" else "null:world")) e.printStackTrace } - } + } } } - - @SideOnly(Side.CLIENT) protected override def newRenderer: TileRender = - { - return new RotatedTextureRenderer(this) - } } - -object TileTurntable { - var top: Icon = null -} \ No newline at end of file diff --git a/src/main/scala/resonantinduction/archaic/crate/BlockCrate.java b/src/main/scala/resonantinduction/archaic/crate/BlockCrate.java index 25ca99ec0..89de0a2e1 100644 --- a/src/main/scala/resonantinduction/archaic/crate/BlockCrate.java +++ b/src/main/scala/resonantinduction/archaic/crate/BlockCrate.java @@ -3,7 +3,7 @@ package resonantinduction.archaic.crate; import java.util.ArrayList; import java.util.List; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -11,7 +11,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatMessageComponent; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; import resonant.lib.prefab.block.BlockTile; @@ -31,7 +31,7 @@ import cpw.mods.fml.relauncher.SideOnly; * @author DarkGuardsman */ public class BlockCrate extends BlockTile { - Icon advanced, elite; + IIcon advanced, elite; public BlockCrate(int id) { @@ -40,7 +40,7 @@ public class BlockCrate extends BlockTile @SideOnly(Side.CLIENT) @Override - public void registerIcons(IconRegister iconReg) + public void registerIcons(IIconRegister iconReg) { this.blockIcon = iconReg.registerIcon(Reference.PREFIX + "crate_wood"); this.advanced = iconReg.registerIcon(Reference.PREFIX + "crate_iron"); @@ -49,7 +49,7 @@ public class BlockCrate extends BlockTile @Override @SideOnly(Side.CLIENT) - public Icon getIcon(int side, int meta) + public IIcon getIcon(int side, int meta) { if (meta == 1) { diff --git a/src/main/scala/resonantinduction/archaic/crate/PathfinderCrate.java b/src/main/scala/resonantinduction/archaic/crate/PathfinderCrate.java index 829d9148b..874ec925b 100644 --- a/src/main/scala/resonantinduction/archaic/crate/PathfinderCrate.java +++ b/src/main/scala/resonantinduction/archaic/crate/PathfinderCrate.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; -import universalelectricity.api.vector.Vector3; +import net.minecraftforge.common.util.ForgeDirection; +import universalelectricity.core.transform.vector.Vector3; import universalelectricity.api.vector.VectorHelper; /** diff --git a/src/main/scala/resonantinduction/archaic/crate/TileCrate.java b/src/main/scala/resonantinduction/archaic/crate/TileCrate.java index b8a5b7ae8..f12c1db78 100644 --- a/src/main/scala/resonantinduction/archaic/crate/TileCrate.java +++ b/src/main/scala/resonantinduction/archaic/crate/TileCrate.java @@ -9,7 +9,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; import resonant.api.IExtendedStorage; import resonant.api.IFilterable; diff --git a/src/main/scala/resonantinduction/archaic/engineering/TileEngineeringTable.java b/src/main/scala/resonantinduction/archaic/engineering/TileEngineeringTable.java index 3eae0ffb5..23dc38bbe 100644 --- a/src/main/scala/resonantinduction/archaic/engineering/TileEngineeringTable.java +++ b/src/main/scala/resonantinduction/archaic/engineering/TileEngineeringTable.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Set; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; @@ -17,8 +17,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; -import net.minecraftforge.common.ForgeDirection; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; import org.apache.commons.lang3.ArrayUtils; @@ -47,7 +47,7 @@ import resonantinduction.core.ResonantInduction; import resonantinduction.core.ResonantInduction.RecipeType; import resonantinduction.core.prefab.imprint.ItemImprint; import universalelectricity.api.vector.Vector2; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import codechicken.multipart.ControlKeyModifer; import com.google.common.io.ByteArrayDataInput; @@ -87,7 +87,7 @@ public class TileEngineeringTable extends TileInventory implements IPacketReceiv private int[] playerSlots; @SideOnly(Side.CLIENT) - private static Icon iconTop, iconFront, iconSide; + private static IIcon iconTop, iconFront, iconSide; public TileEngineeringTable() { @@ -100,14 +100,14 @@ public class TileEngineeringTable extends TileInventory implements IPacketReceiv @Override @SideOnly(Side.CLIENT) - public Icon getIcon(int side, int meta) + public IIcon getIcon(int side, int meta) { return side == 1 ? iconTop : (side == meta ? iconFront : iconSide); } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister iconRegister) + public void registerIcons(IIconRegister iconRegister) { iconTop = iconRegister.registerIcon(getTextureName() + "_top"); iconFront = iconRegister.registerIcon(getTextureName() + "_front"); @@ -184,9 +184,9 @@ public class TileEngineeringTable extends TileInventory implements IPacketReceiv final double regionLength = 1d / 3d; // Rotate the hit vector based on direction of the tile. - hitVector.translate(new Vector3(-0.5, 0, -0.5)); + hitVector.add(new Vector3(-0.5, 0, -0.5)); hitVector.rotate(WorldUtility.getAngleFromForgeDirection(getDirection()), Vector3.UP()); - hitVector.translate(new Vector3(0.5, 0, 0.5)); + hitVector.add(new Vector3(0.5, 0, 0.5)); /** Crafting Matrix */ matrix: @@ -364,7 +364,7 @@ public class TileEngineeringTable extends TileInventory implements IPacketReceiv for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - TileEntity tile = new Vector3(this).translate(dir).getTileEntity(worldObj); + TileEntity tile = new Vector3(this).add(dir).getTileEntity(worldObj); if (tile instanceof IInventory) { @@ -440,7 +440,7 @@ public class TileEngineeringTable extends TileInventory implements IPacketReceiv for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - TileEntity tile = new Vector3(this).translate(dir).getTileEntity(worldObj); + TileEntity tile = new Vector3(this).add(dir).getTileEntity(worldObj); if (tile instanceof IInventory) { @@ -736,7 +736,7 @@ public class TileEngineeringTable extends TileInventory implements IPacketReceiv for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - TileEntity tile = new Vector3(this).translate(dir).getTileEntity(worldObj); + TileEntity tile = new Vector3(this).add(dir).getTileEntity(worldObj); if (tile instanceof IInventory) { diff --git a/src/main/scala/resonantinduction/archaic/filter/BlockImprinter.java b/src/main/scala/resonantinduction/archaic/filter/BlockImprinter.java index ca809bae2..5d75d0e7a 100644 --- a/src/main/scala/resonantinduction/archaic/filter/BlockImprinter.java +++ b/src/main/scala/resonantinduction/archaic/filter/BlockImprinter.java @@ -1,21 +1,21 @@ package resonantinduction.archaic.filter; import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.prefab.block.BlockTile; import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.Reference; import resonantinduction.core.prefab.imprint.ItemImprint; import universalelectricity.api.UniversalElectricity; import universalelectricity.api.vector.Vector2; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import universalelectricity.api.vector.VectorWorld; import codechicken.multipart.ControlKeyModifer; import cpw.mods.fml.relauncher.Side; @@ -23,9 +23,9 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockImprinter extends BlockTile { - Icon imprinter_side; - Icon imprinter_top; - Icon imprinter_bottom; + IIcon imprinter_side; + IIcon imprinter_top; + IIcon imprinter_bottom; public BlockImprinter(int id) { @@ -34,7 +34,7 @@ public class BlockImprinter extends BlockTile @SideOnly(Side.CLIENT) @Override - public void registerIcons(IconRegister iconReg) + public void registerIcons(IIconRegister iconReg) { this.imprinter_side = iconReg.registerIcon(Reference.PREFIX + "imprinter_side"); this.imprinter_top = iconReg.registerIcon(Reference.PREFIX + "imprinter_top"); @@ -43,7 +43,7 @@ public class BlockImprinter extends BlockTile @Override @SideOnly(Side.CLIENT) - public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int side) + public IIcon getBlockTexture(IBlockAccess world, int x, int y, int z, int side) { return getIcon(side, 0); } @@ -51,7 +51,7 @@ public class BlockImprinter extends BlockTile /** Returns the block texture based on the side being looked at. Args: side */ @Override @SideOnly(Side.CLIENT) - public Icon getIcon(int side, int meta) + public IIcon getIcon(int side, int meta) { if (side == 1) { @@ -75,7 +75,7 @@ public class BlockImprinter extends BlockTile if (te instanceof TileImprinter) { TileImprinter tile = (TileImprinter) te; - int idOnTop = ((VectorWorld) new VectorWorld(world, x, y, z).translate(ForgeDirection.getOrientation(1))).getBlockID(); + int idOnTop = ((VectorWorld) new VectorWorld(world, x, y, z).add(ForgeDirection.getOrientation(1))).getBlock(); if (Block.pistonMoving.blockID == blockID) { diff --git a/src/main/scala/resonantinduction/archaic/filter/RenderImprinter.java b/src/main/scala/resonantinduction/archaic/filter/RenderImprinter.java index 174c01632..9723d963e 100644 --- a/src/main/scala/resonantinduction/archaic/filter/RenderImprinter.java +++ b/src/main/scala/resonantinduction/archaic/filter/RenderImprinter.java @@ -3,7 +3,7 @@ package resonantinduction.archaic.filter; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.render.RenderItemOverlayUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/scala/resonantinduction/archaic/filter/TileFilter.java b/src/main/scala/resonantinduction/archaic/filter/TileFilter.java index 057a694a9..3751b5fad 100644 --- a/src/main/scala/resonantinduction/archaic/filter/TileFilter.java +++ b/src/main/scala/resonantinduction/archaic/filter/TileFilter.java @@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; @@ -31,7 +31,7 @@ import resonantinduction.core.prefab.imprint.ItemImprint; import resonantinduction.core.prefab.imprint.TileFilterable; import resonantinduction.core.resource.ResourceGenerator; import resonantinduction.core.resource.fluid.BlockFluidMixture; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -81,10 +81,10 @@ public class TileFilter extends TileFilterable implements IFilterable /** Fluid filters */ Vector3 position = new Vector3(this); - Vector3 checkAbove = position.clone().translate(ForgeDirection.UP); - Vector3 checkBelow = position.clone().translate(ForgeDirection.DOWN); + Vector3 checkAbove = position.clone().add(ForgeDirection.UP); + Vector3 checkBelow = position.clone().add(ForgeDirection.DOWN); - Block bAbove = Block.blocksList[checkAbove.getBlockID(worldObj)]; + Block bAbove = Block.blocksList[checkAbove.getBlock(worldObj)]; if (bAbove instanceof BlockFluidMixture && worldObj.isAirBlock(checkBelow.intX(), checkBelow.intY(), checkBelow.intZ())) { diff --git a/src/main/scala/resonantinduction/archaic/firebox/BlockFirebox.java b/src/main/scala/resonantinduction/archaic/firebox/BlockFirebox.java index 42ac7a055..129842526 100644 --- a/src/main/scala/resonantinduction/archaic/firebox/BlockFirebox.java +++ b/src/main/scala/resonantinduction/archaic/firebox/BlockFirebox.java @@ -5,12 +5,12 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import resonant.lib.prefab.block.BlockTile; @@ -21,15 +21,15 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockFirebox extends BlockTile { - private Icon topOn; - private Icon topOff; - private Icon sideOn; - private Icon sideOff; + private IIcon topOn; + private IIcon topOff; + private IIcon sideOn; + private IIcon sideOff; - private Icon topElectricOn; - private Icon topElectricOff; - private Icon sideOnElectric; - private Icon sideOffElectric; + private IIcon topElectricOn; + private IIcon topElectricOff; + private IIcon sideOnElectric; + private IIcon sideOffElectric; public BlockFirebox(int id) { @@ -40,7 +40,7 @@ public class BlockFirebox extends BlockTile @Override @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister iconReg) + public void registerIcons(IIconRegister iconReg) { super.registerIcons(iconReg); sideOn = iconReg.registerIcon(Reference.PREFIX + "firebox_side_on"); @@ -88,7 +88,7 @@ public class BlockFirebox extends BlockTile } @Override - public Icon getBlockTexture(IBlockAccess access, int x, int y, int z, int side) + public IIcon getBlockTexture(IBlockAccess access, int x, int y, int z, int side) { if (side == 0) return blockIcon; @@ -112,7 +112,7 @@ public class BlockFirebox extends BlockTile @Override @SideOnly(Side.CLIENT) - public Icon getIcon(int side, int meta) + public IIcon getIcon(int side, int meta) { if (side == 0) return blockIcon; diff --git a/src/main/scala/resonantinduction/archaic/firebox/BlockHotPlate.java b/src/main/scala/resonantinduction/archaic/firebox/BlockHotPlate.java index bd14f9267..9dc5fe46d 100644 --- a/src/main/scala/resonantinduction/archaic/firebox/BlockHotPlate.java +++ b/src/main/scala/resonantinduction/archaic/firebox/BlockHotPlate.java @@ -3,23 +3,23 @@ package resonantinduction.archaic.firebox; import java.util.Random; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.DamageSource; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.World; import resonant.lib.prefab.block.BlockTile; import resonantinduction.core.Reference; import universalelectricity.api.vector.Vector2; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class BlockHotPlate extends BlockTile { - private Icon topElectric; + private IIcon topElectric; public BlockHotPlate(int id) { @@ -42,7 +42,7 @@ public class BlockHotPlate extends BlockTile @Override @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister iconReg) + public void registerIcons(IIconRegister iconReg) { super.registerIcons(iconReg); topElectric = iconReg.registerIcon(Reference.PREFIX + "electricHotPlate"); @@ -50,7 +50,7 @@ public class BlockHotPlate extends BlockTile @Override @SideOnly(Side.CLIENT) - public Icon getIcon(int side, int meta) + public IIcon getIcon(int side, int meta) { return meta == 1 ? topElectric : blockIcon; } @@ -131,12 +131,12 @@ public class BlockHotPlate extends BlockTile for (int spawn = 0; spawn < maxParticles; spawn++) { - Vector3 particlePosition = new Vector3(x, y, z).translate((double) (i / 2) / ((double) 2) + (0.5 / (2)), 0.2, (double) (i % 2) / ((double) 2) + (0.5 / (2))); - particlePosition.translate(new Vector3((random.nextFloat() - 0.5) * 0.2, (random.nextFloat() - 0.5) * 0.2, (random.nextFloat() - 0.5) * 0.2)); + Vector3 particlePosition = new Vector3(x, y, z).add((double) (i / 2) / ((double) 2) + (0.5 / (2)), 0.2, (double) (i % 2) / ((double) 2) + (0.5 / (2))); + particlePosition.add(new Vector3((random.nextFloat() - 0.5) * 0.2, (random.nextFloat() - 0.5) * 0.2, (random.nextFloat() - 0.5) * 0.2)); world.spawnParticle("smoke", particlePosition.x, particlePosition.y, particlePosition.z, 0.0D, 0.0D, 0.0D); } - Vector3 particlePosition = new Vector3(x, y, z).translate((double) (i / 2) / ((double) 2) + (0.5 / (2)), 0.2, (double) (i % 2) / ((double) 2) + (0.5 / (2))); + Vector3 particlePosition = new Vector3(x, y, z).add((double) (i / 2) / ((double) 2) + (0.5 / (2)), 0.2, (double) (i % 2) / ((double) 2) + (0.5 / (2))); world.spawnParticle("flame", particlePosition.x, particlePosition.y, particlePosition.z, 0.0D, 0.01D, 0.0D); } } diff --git a/src/main/scala/resonantinduction/archaic/firebox/RenderHotPlate.java b/src/main/scala/resonantinduction/archaic/firebox/RenderHotPlate.java index d6ad0576a..92da47e5a 100644 --- a/src/main/scala/resonantinduction/archaic/firebox/RenderHotPlate.java +++ b/src/main/scala/resonantinduction/archaic/firebox/RenderHotPlate.java @@ -3,7 +3,7 @@ package resonantinduction.archaic.firebox; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.render.RenderItemOverlayUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.java b/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.java index e28db5891..416c3e157 100644 --- a/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.java +++ b/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.java @@ -9,7 +9,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -31,7 +31,7 @@ import resonantinduction.core.ResonantInduction; import resonantinduction.core.resource.ResourceGenerator; import resonantinduction.core.resource.TileMaterial; import universalelectricity.api.energy.EnergyStorageHandler; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import com.google.common.io.ByteArrayDataInput; @@ -154,7 +154,7 @@ public class TileFirebox extends TileElectricalInventory implements IPacketRecei { if (FluidRegistry.getFluid("steam") != null) { - MinecraftForge.EVENT_BUS.post(new BoilEvent(worldObj, new Vector3(this).translate(0, 1, 0), new FluidStack(FluidRegistry.WATER, volume), new FluidStack(FluidRegistry.getFluid("steam"), volume), 2, false)); + MinecraftForge.EVENT_BUS.post(new BoilEvent(worldObj, new Vector3(this).add(0, 1, 0), new FluidStack(FluidRegistry.WATER, volume), new FluidStack(FluidRegistry.getFluid("steam"), volume), 2, false)); boiledVolume += volume; } @@ -179,7 +179,7 @@ public class TileFirebox extends TileElectricalInventory implements IPacketRecei { if (FluidRegistry.getFluid("steam") != null) { - MinecraftForge.EVENT_BUS.post(new BoilEvent(worldObj, new Vector3(this).translate(0, 1, 0), new FluidStack(FluidRegistry.WATER, volume), new FluidStack(FluidRegistry.getFluid("steam"), volume), 2, false)); + MinecraftForge.EVENT_BUS.post(new BoilEvent(worldObj, new Vector3(this).add(0, 1, 0), new FluidStack(FluidRegistry.WATER, volume), new FluidStack(FluidRegistry.getFluid("steam"), volume), 2, false)); ((TileGutter) tileEntity).drain(ForgeDirection.DOWN, volume, true); } diff --git a/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.java b/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.java index 6ff852787..51544fef0 100644 --- a/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.java +++ b/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.java @@ -6,12 +6,12 @@ import java.util.HashMap; import java.util.PriorityQueue; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; @@ -23,7 +23,7 @@ import resonant.lib.utility.FluidUtility; import resonantinduction.core.Reference; import resonantinduction.core.grid.fluid.FluidPressureNode; import resonantinduction.core.grid.fluid.TilePressureNode; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -35,7 +35,7 @@ public class TileGrate extends TilePressureNode implements IRotatable private static double grateDrainSpeedMultiplier = 0.01; @SideOnly(Side.CLIENT) - private static Icon iconFront, iconSide; + private static IIcon iconFront, iconSide; private GratePathfinder gratePath; @@ -52,20 +52,20 @@ public class TileGrate extends TilePressureNode implements IRotatable } @Override - public Icon getIcon(IBlockAccess world, int side) + public IIcon getIcon(IBlockAccess world, int side) { return side == getDirection().ordinal() ? iconFront : iconSide; } @Override - public Icon getIcon(int side, int metadata) + public IIcon getIcon(int side, int metadata) { return side == 1 ? iconFront : iconSide; } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister iconRegister) + public void registerIcons(IIconRegister iconRegister) { iconFront = iconRegister.registerIcon(Reference.PREFIX + "grate_front"); iconSide = iconRegister.registerIcon(Reference.PREFIX + "grate"); @@ -317,7 +317,7 @@ public class TileGrate extends TilePressureNode implements IRotatable if (dir == TileGrate.this.getDirection()) { - Vector3 check = start.clone().translate(dir); + Vector3 check = start.clone().add(dir); this.navigationMap.put(check, start); this.workingNodes.add(new TileGrate.ComparableVector(check, 0)); } @@ -380,7 +380,7 @@ public class TileGrate extends TilePressureNode implements IRotatable { for (int i = 0; i < 6; i++) { - Vector3 newPosition = next.position.clone().translate(ForgeDirection.getOrientation(i)); + Vector3 newPosition = next.position.clone().add(ForgeDirection.getOrientation(i)); if (!this.navigationMap.containsKey(newPosition) && !(!fillOver && newPosition.intY() > y())) { @@ -401,7 +401,7 @@ public class TileGrate extends TilePressureNode implements IRotatable if (dir == TileGrate.this.getDirection()) { - Vector3 check = start.clone().translate(dir); + Vector3 check = start.clone().add(dir); this.navigationMap.put(check, start); this.workingNodes.add(new ComparableVector(check, 0)); fluidType = FluidUtility.getFluidFromBlock(TileGrate.this.worldObj, check); @@ -450,7 +450,7 @@ public class TileGrate extends TilePressureNode implements IRotatable { for (int i = 0; i < 6; i++) { - Vector3 check = next.position.clone().translate(ForgeDirection.getOrientation(i)); + Vector3 check = next.position.clone().add(ForgeDirection.getOrientation(i)); Fluid checkFluid = FluidUtility.getFluidFromBlock(TileGrate.this.worldObj, check); if (checkFluid != null && fluidType.getID() == checkFluid.getID()) diff --git a/src/main/scala/resonantinduction/archaic/fluid/gutter/FluidGravityNode.java b/src/main/scala/resonantinduction/archaic/fluid/gutter/FluidGravityNode.java index 731528424..75e503f84 100644 --- a/src/main/scala/resonantinduction/archaic/fluid/gutter/FluidGravityNode.java +++ b/src/main/scala/resonantinduction/archaic/fluid/gutter/FluidGravityNode.java @@ -1,6 +1,6 @@ package resonantinduction.archaic.fluid.gutter; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonantinduction.core.grid.fluid.FluidPressureNode; import resonantinduction.core.grid.fluid.IPressureNodeProvider; diff --git a/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.java b/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.java index a92aa547f..10ba63075 100644 --- a/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.java +++ b/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.java @@ -13,7 +13,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -38,7 +38,7 @@ import resonantinduction.core.ResonantInduction.RecipeType; import resonantinduction.core.grid.fluid.FluidPressureNode; import resonantinduction.core.grid.fluid.IPressureNodeProvider; import resonantinduction.core.grid.fluid.TilePressureNode; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -68,7 +68,7 @@ public class TileGutter extends TilePressureNode for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - TileEntity tile = position().translate(dir).getTileEntity(world()); + TileEntity tile = position().add(dir).getTileEntity(world()); if (tile instanceof IFluidHandler) { @@ -116,7 +116,7 @@ public class TileGutter extends TilePressureNode if (!this.world().isRemote && this.ticks % 20 == 0) { /** Drain block above if it is a fluid. */ - Vector3 drainPos = position().translate(0, 1, 0); + Vector3 drainPos = position().add(0, 1, 0); FluidStack drain = FluidUtility.drainBlock(worldObj, drainPos, false); if (drain != null) @@ -200,7 +200,7 @@ public class TileGutter extends TilePressureNode { ForgeDirection dir = ForgeDirection.getOrientation(i); int pressure = node.getPressure(dir); - Vector3 position = position().translate(dir); + Vector3 position = position().add(dir); TileEntity checkTile = position.getTileEntity(world()); diff --git a/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.java b/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.java index 4305a083c..6e0ca4410 100644 --- a/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.java +++ b/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.java @@ -11,7 +11,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; @@ -20,7 +20,7 @@ import org.lwjgl.opengl.GL11; import resonant.api.IRemovable.ISneakPickup; import resonant.api.items.ISimpleItemRenderer; -import resonant.lib.content.module.TileBlock.IComparatorInputOverride; +import resonant.content.spatial.block.SpatialBlock.IComparatorInputOverride; import resonant.lib.content.module.TileRender; import resonant.lib.render.FluidRenderUtility; import resonant.lib.render.RenderUtility; @@ -33,7 +33,7 @@ import resonantinduction.core.grid.fluid.FluidDistributionetwork; import resonantinduction.core.grid.fluid.IFluidDistribution; import resonantinduction.core.grid.fluid.TileFluidDistribution; import universalelectricity.api.UniversalElectricity; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/scala/resonantinduction/archaic/process/BlockCastingMold.java b/src/main/scala/resonantinduction/archaic/process/BlockCastingMold.java index d4ebfa726..2b5f110a9 100644 --- a/src/main/scala/resonantinduction/archaic/process/BlockCastingMold.java +++ b/src/main/scala/resonantinduction/archaic/process/BlockCastingMold.java @@ -9,7 +9,7 @@ import resonant.lib.prefab.block.BlockTile; import resonant.lib.render.block.BlockRenderingHandler; import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.Reference; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/scala/resonantinduction/archaic/process/BlockMillstone.java b/src/main/scala/resonantinduction/archaic/process/BlockMillstone.java index a3417c97c..4a0047e57 100644 --- a/src/main/scala/resonantinduction/archaic/process/BlockMillstone.java +++ b/src/main/scala/resonantinduction/archaic/process/BlockMillstone.java @@ -1,24 +1,24 @@ package resonantinduction.archaic.process; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import resonant.lib.prefab.block.BlockTile; import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.Reference; import resonantinduction.core.resource.ItemHandCrank; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class BlockMillstone extends BlockTile { - Icon top; + IIcon top; public BlockMillstone(int id) { @@ -28,7 +28,7 @@ public class BlockMillstone extends BlockTile @SideOnly(Side.CLIENT) @Override - public void registerIcons(IconRegister iconReg) + public void registerIcons(IIconRegister iconReg) { this.top = iconReg.registerIcon(Reference.PREFIX + "millstone_top"); super.registerIcons(iconReg); @@ -36,7 +36,7 @@ public class BlockMillstone extends BlockTile @Override @SideOnly(Side.CLIENT) - public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int side) + public IIcon getBlockTexture(IBlockAccess world, int x, int y, int z, int side) { return getIcon(side, 0); } @@ -44,7 +44,7 @@ public class BlockMillstone extends BlockTile /** Returns the block texture based on the side being looked at. Args: side */ @Override @SideOnly(Side.CLIENT) - public Icon getIcon(int side, int meta) + public IIcon getIcon(int side, int meta) { if (side == 0 || side == 1) { diff --git a/src/main/scala/resonantinduction/archaic/process/TileCastingMold.java b/src/main/scala/resonantinduction/archaic/process/TileCastingMold.java index c0f3737ad..f7eb5653f 100644 --- a/src/main/scala/resonantinduction/archaic/process/TileCastingMold.java +++ b/src/main/scala/resonantinduction/archaic/process/TileCastingMold.java @@ -3,7 +3,7 @@ package resonantinduction.archaic.process; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; @@ -18,7 +18,7 @@ import resonant.lib.prefab.tile.TileExternalInventory; import resonant.lib.utility.FluidUtility; import resonantinduction.core.ResonantInduction; import resonantinduction.core.ResonantInduction.RecipeType; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import com.google.common.io.ByteArrayDataInput; @@ -78,7 +78,7 @@ public class TileCastingMold extends TileExternalInventory implements IFluidHand /** * Check blocks above for fluid. */ - Vector3 checkPos = new Vector3(this).translate(0, 1, 0); + Vector3 checkPos = new Vector3(this).add(0, 1, 0); FluidStack drainStack = FluidUtility.drainBlock(worldObj, checkPos, false); if (MachineRecipes.INSTANCE.getOutput(RecipeType.SMELTER.name(), drainStack).length > 0) diff --git a/src/main/scala/resonantinduction/archaic/process/TileMillstone.java b/src/main/scala/resonantinduction/archaic/process/TileMillstone.java index b6aa3a311..3657342d3 100644 --- a/src/main/scala/resonantinduction/archaic/process/TileMillstone.java +++ b/src/main/scala/resonantinduction/archaic/process/TileMillstone.java @@ -4,7 +4,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.recipe.MachineRecipes; import resonant.api.recipe.RecipeResource; import resonant.lib.network.IPacketReceiver; @@ -13,7 +13,7 @@ import resonant.lib.prefab.tile.TileExternalInventory; import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.ResonantInduction; import resonantinduction.core.ResonantInduction.RecipeType; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import com.google.common.io.ByteArrayDataInput; diff --git a/src/main/scala/resonantinduction/atomic/Atomic.java b/src/main/scala/resonantinduction/atomic/Atomic.java index f248c07c6..f77120e83 100644 --- a/src/main/scala/resonantinduction/atomic/Atomic.java +++ b/src/main/scala/resonantinduction/atomic/Atomic.java @@ -116,7 +116,7 @@ import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.Settings; import resonantinduction.core.TabRI; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import universalelectricity.api.vector.VectorWorld; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; @@ -651,7 +651,7 @@ public class Atomic public void thermalEventHandler(EventThermalUpdate evt) { VectorWorld pos = evt.position; - Block block = Block.blocksList[pos.getBlockID()]; + Block block = Block.blocksList[pos.getBlock()]; if (block == blockElectromagnet) { @@ -664,7 +664,7 @@ public class Atomic { World world = evt.world; Vector3 position = new Vector3(evt.x, evt.y, evt.z); - int blockID = position.getBlockID(world); + int blockID = position.getBlock(world); Block block = Block.blocksList[blockID]; @@ -733,7 +733,7 @@ public class Atomic if (!evt.world.isRemote && evt.target != null && evt.target.typeOfHit == EnumMovingObjectType.TILE) { Vector3 blockPos = new Vector3(evt.target); - int blockID = blockPos.getBlockID(evt.world); + int blockID = blockPos.getBlock(evt.world); if (blockID == blockToxicWaste.blockID) { diff --git a/src/main/scala/resonantinduction/atomic/blocks/BlockToxicWaste.java b/src/main/scala/resonantinduction/atomic/blocks/BlockToxicWaste.java index cc3b22da9..01538c844 100644 --- a/src/main/scala/resonantinduction/atomic/blocks/BlockToxicWaste.java +++ b/src/main/scala/resonantinduction/atomic/blocks/BlockToxicWaste.java @@ -10,7 +10,7 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.FluidRegistry; import resonant.lib.prefab.poison.PoisonRadiation; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; public class BlockToxicWaste extends BlockFluidClassic { diff --git a/src/main/scala/resonantinduction/atomic/blocks/BlockUraniumOre.java b/src/main/scala/resonantinduction/atomic/blocks/BlockUraniumOre.java index 1e483e22c..f8b34dcdb 100644 --- a/src/main/scala/resonantinduction/atomic/blocks/BlockUraniumOre.java +++ b/src/main/scala/resonantinduction/atomic/blocks/BlockUraniumOre.java @@ -3,7 +3,7 @@ package resonantinduction.atomic.blocks; import java.util.Random; import net.minecraft.block.material.Material; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.World; import resonant.lib.prefab.block.BlockRadioactive; import resonantinduction.core.Reference; @@ -43,7 +43,7 @@ public class BlockUraniumOre extends BlockRadioactive } @Override - public Icon getIcon(int side, int metadata) + public IIcon getIcon(int side, int metadata) { return this.blockIcon; } diff --git a/src/main/scala/resonantinduction/atomic/blocks/TileElectromagnet.java b/src/main/scala/resonantinduction/atomic/blocks/TileElectromagnet.java index f8c6ccaf2..b7d456eb1 100644 --- a/src/main/scala/resonantinduction/atomic/blocks/TileElectromagnet.java +++ b/src/main/scala/resonantinduction/atomic/blocks/TileElectromagnet.java @@ -2,10 +2,10 @@ package resonantinduction.atomic.blocks; import java.util.List; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import resonant.api.IElectromagnet; import resonant.lib.content.module.TileBase; @@ -20,7 +20,7 @@ import cpw.mods.fml.relauncher.SideOnly; /** Electromagnet block */ public class TileElectromagnet extends TileBase implements IElectromagnet { - private static Icon iconTop, iconGlass; + private static IIcon iconTop, iconGlass; public TileElectromagnet() { @@ -31,7 +31,7 @@ public class TileElectromagnet extends TileBase implements IElectromagnet } @Override - public Icon getIcon(int side, int metadata) + public IIcon getIcon(int side, int metadata) { if (metadata == 1) { @@ -48,7 +48,7 @@ public class TileElectromagnet extends TileBase implements IElectromagnet @SideOnly(Side.CLIENT) @Override - public void registerIcons(IconRegister iconRegister) + public void registerIcons(IIconRegister iconRegister) { super.registerIcons(iconRegister); iconTop = iconRegister.registerIcon(domain + textureName + "_top"); diff --git a/src/main/scala/resonantinduction/atomic/blocks/TileSiren.java b/src/main/scala/resonantinduction/atomic/blocks/TileSiren.java index 5109e0bd2..e944ddc28 100644 --- a/src/main/scala/resonantinduction/atomic/blocks/TileSiren.java +++ b/src/main/scala/resonantinduction/atomic/blocks/TileSiren.java @@ -2,14 +2,14 @@ package resonantinduction.atomic.blocks; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; -import resonant.lib.content.module.TileBlock; +import net.minecraftforge.common.util.ForgeDirection; +import resonant.content.spatial.block.SpatialBlock; import resonantinduction.core.Reference; import universalelectricity.api.UniversalElectricity; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; /** Siren block */ -public class TileSiren extends TileBlock +public class TileSiren extends SpatialBlock { public TileSiren() { @@ -41,8 +41,8 @@ public class TileSiren extends TileBlock float volume = 0.5f; for (int i = 0; i < 6; i++) { - Vector3 check = position().translate(ForgeDirection.getOrientation(i)); - if (check.getBlockID(world) == blockID()) + Vector3 check = position().add(ForgeDirection.getOrientation(i)); + if (check.getBlock(world) == blockID()) { volume *= 1.5f; } diff --git a/src/main/scala/resonantinduction/quantum/gate/IQuantumGate.java b/src/main/scala/resonantinduction/atomic/gate/IQuantumGate.java similarity index 92% rename from src/main/scala/resonantinduction/quantum/gate/IQuantumGate.java rename to src/main/scala/resonantinduction/atomic/gate/IQuantumGate.java index 22b4e407f..3e432b52e 100644 --- a/src/main/scala/resonantinduction/quantum/gate/IQuantumGate.java +++ b/src/main/scala/resonantinduction/atomic/gate/IQuantumGate.java @@ -1,4 +1,4 @@ -package resonantinduction.quantum.gate; +package resonantinduction.atomic.gate; import net.minecraft.entity.Entity; import net.minecraft.inventory.ISidedInventory; diff --git a/src/main/scala/resonantinduction/quantum/gate/ItemQuantumGlyph.java b/src/main/scala/resonantinduction/atomic/gate/ItemQuantumGlyph.java similarity index 98% rename from src/main/scala/resonantinduction/quantum/gate/ItemQuantumGlyph.java rename to src/main/scala/resonantinduction/atomic/gate/ItemQuantumGlyph.java index df00d77a8..1acaf5e10 100644 --- a/src/main/scala/resonantinduction/quantum/gate/ItemQuantumGlyph.java +++ b/src/main/scala/resonantinduction/atomic/gate/ItemQuantumGlyph.java @@ -1,4 +1,4 @@ -package resonantinduction.quantum.gate; +package resonantinduction.atomic.gate; import java.util.List; diff --git a/src/main/scala/resonantinduction/quantum/gate/PartQuantumGlyph.java b/src/main/scala/resonantinduction/atomic/gate/PartQuantumGlyph.java similarity index 96% rename from src/main/scala/resonantinduction/quantum/gate/PartQuantumGlyph.java rename to src/main/scala/resonantinduction/atomic/gate/PartQuantumGlyph.java index e8ef000c1..752cfaeee 100644 --- a/src/main/scala/resonantinduction/quantum/gate/PartQuantumGlyph.java +++ b/src/main/scala/resonantinduction/atomic/gate/PartQuantumGlyph.java @@ -1,4 +1,4 @@ -package resonantinduction.quantum.gate; +package resonantinduction.atomic.gate; import java.util.ArrayList; import java.util.Arrays; @@ -12,7 +12,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; @@ -114,7 +114,7 @@ public class PartQuantumGlyph extends JCuboidPart implements TSlottedPart, JNorm if (gates.size() > 0) { IQuantumGate gate = gates.get(gates.size() > 1 ? entity.worldObj.rand.nextInt(gates.size() - 1) : 0); - VectorWorld position = new VectorWorld((TileEntity) gate).translate(0.5, 2, 0.5); + VectorWorld position = new VectorWorld((TileEntity) gate).add(0.5, 2, 0.5); if (QuantumGateManager.moveEntity(entity, position)) world().playSoundAtEntity(entity, "mob.endermen.portal", 1.0F, 1.0F); } @@ -137,8 +137,8 @@ public class PartQuantumGlyph extends JCuboidPart implements TSlottedPart, JNorm { float deviation = 1; // Spawn particle effects. - universalelectricity.api.vector.Vector3 center = new universalelectricity.api.vector.Vector3(x() + 0.5, y() + 0.5, z() + 0.5); - Electrical.proxy.renderElectricShock(world(), center, center.clone().translate(Math.random() * deviation - deviation / 2, Math.random() * deviation - deviation / 2, Math.random() * deviation - deviation / 2)); + universalelectricity.core.transform.vector.Vector3 center = new universalelectricity.core.transform.vector.Vector3(x() + 0.5, y() + 0.5, z() + 0.5); + Electrical.proxy.renderElectricShock(world(), center, center.clone().add(Math.random() * deviation - deviation / 2, Math.random() * deviation - deviation / 2, Math.random() * deviation - deviation / 2)); } } } diff --git a/src/main/scala/resonantinduction/quantum/gate/QuantumGateManager.java b/src/main/scala/resonantinduction/atomic/gate/QuantumGateManager.java similarity index 99% rename from src/main/scala/resonantinduction/quantum/gate/QuantumGateManager.java rename to src/main/scala/resonantinduction/atomic/gate/QuantumGateManager.java index a487438a3..908213ec0 100644 --- a/src/main/scala/resonantinduction/quantum/gate/QuantumGateManager.java +++ b/src/main/scala/resonantinduction/atomic/gate/QuantumGateManager.java @@ -1,4 +1,4 @@ -package resonantinduction.quantum.gate; +package resonantinduction.atomic.gate; import java.util.HashMap; diff --git a/src/main/scala/resonantinduction/quantum/gate/RenderQuantumGlyph.java b/src/main/scala/resonantinduction/atomic/gate/RenderQuantumGlyph.java similarity index 96% rename from src/main/scala/resonantinduction/quantum/gate/RenderQuantumGlyph.java rename to src/main/scala/resonantinduction/atomic/gate/RenderQuantumGlyph.java index 83080afe8..02642e940 100644 --- a/src/main/scala/resonantinduction/quantum/gate/RenderQuantumGlyph.java +++ b/src/main/scala/resonantinduction/atomic/gate/RenderQuantumGlyph.java @@ -1,4 +1,4 @@ -package resonantinduction.quantum.gate; +package resonantinduction.atomic.gate; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.TextureMap; diff --git a/src/main/scala/resonantinduction/quantum/gate/TraitQuantumGate.java b/src/main/scala/resonantinduction/atomic/gate/TraitQuantumGate.java similarity index 97% rename from src/main/scala/resonantinduction/quantum/gate/TraitQuantumGate.java rename to src/main/scala/resonantinduction/atomic/gate/TraitQuantumGate.java index f95c72af5..9faa88f19 100644 --- a/src/main/scala/resonantinduction/quantum/gate/TraitQuantumGate.java +++ b/src/main/scala/resonantinduction/atomic/gate/TraitQuantumGate.java @@ -1,9 +1,9 @@ -package resonantinduction.quantum.gate; +package resonantinduction.atomic.gate; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; diff --git a/src/main/scala/resonantinduction/atomic/items/ItemAntimatter.java b/src/main/scala/resonantinduction/atomic/items/ItemAntimatter.java index 7df2a8ea0..64478108d 100644 --- a/src/main/scala/resonantinduction/atomic/items/ItemAntimatter.java +++ b/src/main/scala/resonantinduction/atomic/items/ItemAntimatter.java @@ -3,13 +3,13 @@ package resonantinduction.atomic.items; import java.util.List; import resonantinduction.atomic.Atomic; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.Explosion; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -23,14 +23,14 @@ import resonantinduction.atomic.Atomic; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.Settings; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; /* Antimatter Cell */ public class ItemAntimatter extends ItemCell { - private Icon iconGram; + private IIcon iconGram; public ItemAntimatter(int itemID) { @@ -41,7 +41,7 @@ public class ItemAntimatter extends ItemCell @SideOnly(Side.CLIENT) @Override - public void registerIcons(IconRegister iconRegister) + public void registerIcons(IIconRegister iconRegister) { // Animated Icons //ResonantInduction.LOGGER.info(this.getUnlocalizedName().replace("item.", "") + "_milligram"); @@ -50,7 +50,7 @@ public class ItemAntimatter extends ItemCell } @Override - public Icon getIconFromDamage(int metadata) + public IIcon getIconFromDamage(int metadata) { if (metadata >= 1) { diff --git a/src/main/scala/resonantinduction/atomic/items/ItemCell.java b/src/main/scala/resonantinduction/atomic/items/ItemCell.java index fa59a04f1..4f7482137 100644 --- a/src/main/scala/resonantinduction/atomic/items/ItemCell.java +++ b/src/main/scala/resonantinduction/atomic/items/ItemCell.java @@ -3,7 +3,7 @@ package resonantinduction.atomic.items; import resonantinduction.atomic.Atomic; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import resonant.api.IReactor; @@ -27,7 +27,7 @@ public class ItemCell extends ItemTooltip @SideOnly(Side.CLIENT) @Override - public void registerIcons(IconRegister iconRegister) + public void registerIcons(IIconRegister iconRegister) { this.itemIcon = iconRegister.registerIcon(this.getUnlocalizedName().replace("item.", "")); } diff --git a/src/main/scala/resonantinduction/atomic/items/ItemDarkMatter.java b/src/main/scala/resonantinduction/atomic/items/ItemDarkMatter.java index 7022436e7..ee01e8ba9 100644 --- a/src/main/scala/resonantinduction/atomic/items/ItemDarkMatter.java +++ b/src/main/scala/resonantinduction/atomic/items/ItemDarkMatter.java @@ -1,6 +1,6 @@ package resonantinduction.atomic.items; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -15,9 +15,9 @@ public class ItemDarkMatter extends ItemCell @SideOnly(Side.CLIENT) @Override - public void registerIcons(IconRegister iconRegister) + public void registerIcons(IIconRegister iconRegister) { - // Animated Icon + // Animated IIcon this.itemIcon = iconRegister.registerIcon(this.getUnlocalizedName().replace("item.", "")); } } diff --git a/src/main/scala/resonantinduction/atomic/items/ItemFissileFuel.java b/src/main/scala/resonantinduction/atomic/items/ItemFissileFuel.java index d0bc8fbfc..bad8a0ba8 100644 --- a/src/main/scala/resonantinduction/atomic/items/ItemFissileFuel.java +++ b/src/main/scala/resonantinduction/atomic/items/ItemFissileFuel.java @@ -7,14 +7,14 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import resonant.api.IReactor; import resonant.api.IReactorComponent; import atomic.machine.reactor.TileReactorCell; import resonantinduction.atomic.Atomic; import resonantinduction.core.Settings; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -49,7 +49,7 @@ public class ItemFissileFuel extends ItemRadioactive implements IReactorComponen for (int i = 0; i < 6; i++) { - Vector3 checkPos = new Vector3(tileEntity).translate(ForgeDirection.getOrientation(i)); + Vector3 checkPos = new Vector3(tileEntity).add(ForgeDirection.getOrientation(i)); TileEntity tile = checkPos.getTileEntity(worldObj); // Check that the other reactors not only exist but also are running. diff --git a/src/main/scala/resonantinduction/atomic/items/ItemRadioactive.java b/src/main/scala/resonantinduction/atomic/items/ItemRadioactive.java index 0ff714210..4e9d1f0a4 100644 --- a/src/main/scala/resonantinduction/atomic/items/ItemRadioactive.java +++ b/src/main/scala/resonantinduction/atomic/items/ItemRadioactive.java @@ -6,7 +6,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import resonant.lib.prefab.poison.PoisonRadiation; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; /** Radioactive Items */ public class ItemRadioactive extends Item diff --git a/src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.java b/src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.java index 5ecd6f7cc..9795a1155 100644 --- a/src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.java +++ b/src/main/scala/resonantinduction/atomic/machine/accelerator/EntityParticle.java @@ -14,11 +14,11 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.ForgeChunkManager.Ticket; import net.minecraftforge.common.ForgeChunkManager.Type; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.IElectromagnet; import resonant.lib.prefab.poison.PoisonRadiation; import resonantinduction.core.Reference; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import universalelectricity.api.vector.VectorHelper; import com.google.common.io.ByteArrayDataInput; @@ -54,7 +54,7 @@ public class EntityParticle extends Entity implements IEntityAdditionalSpawnData public static boolean canSpawnParticle(World world, Vector3 pos) { - Block block = Block.blocksList[pos.getBlockID(world)]; + Block block = Block.blocksList[pos.getBlock(world)]; if (block != null && !block.isAirBlock(world, pos.intX(), pos.intY(), pos.intZ())) { return false; @@ -75,7 +75,7 @@ public class EntityParticle extends Entity implements IEntityAdditionalSpawnData public static boolean isElectromagnet(World world, Vector3 position, ForgeDirection dir) { - Vector3 checkPos = position.clone().translate(dir); + Vector3 checkPos = position.clone().add(dir); TileEntity tile = checkPos.getTileEntity(world); if (tile instanceof IElectromagnet) @@ -187,7 +187,7 @@ public class EntityParticle extends Entity implements IEntityAdditionalSpawnData } Vector3 dongLi = new Vector3(); - dongLi.translate(this.movementDirection); + dongLi.add(this.movementDirection); dongLi.scale(acceleration); this.motionX = Math.min(dongLi.x + this.motionX, TileAccelerator.clientParticleVelocity); this.motionY = Math.min(dongLi.y + this.motionY, TileAccelerator.clientParticleVelocity); @@ -229,17 +229,17 @@ public class EntityParticle extends Entity implements IEntityAdditionalSpawnData { ForgeDirection zuoFangXiang = VectorHelper.getOrientationFromSide(this.movementDirection, ForgeDirection.EAST); Vector3 zuoBian = new Vector3(this).floor(); - zuoBian.translate(zuoFangXiang); + zuoBian.add(zuoFangXiang); ForgeDirection youFangXiang = VectorHelper.getOrientationFromSide(this.movementDirection, ForgeDirection.WEST); Vector3 youBian = new Vector3(this).floor(); - youBian.translate(youFangXiang); + youBian.add(youFangXiang); - if (zuoBian.getBlockID(this.worldObj) == 0) + if (zuoBian.getBlock(this.worldObj) == 0) { this.movementDirection = zuoFangXiang; } - else if (youBian.getBlockID(this.worldObj) == 0) + else if (youBian.getBlock(this.worldObj) == 0) { this.movementDirection = youFangXiang; } diff --git a/src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.java b/src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.java index 2b2588dc5..5019261da 100644 --- a/src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.java +++ b/src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.java @@ -4,7 +4,7 @@ import net.minecraft.entity.player.InventoryPlayer; import resonant.lib.gui.GuiContainerBase; import universalelectricity.api.energy.UnitDisplay; import universalelectricity.api.energy.UnitDisplay.Unit; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; public class GuiAccelerator extends GuiContainerBase { @@ -27,7 +27,7 @@ public class GuiAccelerator extends GuiContainerBase String status = ""; Vector3 position = new Vector3(this.tileEntity); - position.translate(this.tileEntity.getDirection().getOpposite()); + position.add(this.tileEntity.getDirection().getOpposite()); if (!EntityParticle.canSpawnParticle(this.tileEntity.worldObj, position)) { diff --git a/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.java b/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.java index c16211a6a..00eb455ff 100644 --- a/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.java +++ b/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.java @@ -10,7 +10,7 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.IElectromagnet; import resonant.api.IRotatable; import resonant.lib.network.Synced; @@ -24,7 +24,7 @@ import universalelectricity.api.UniversalElectricity; import universalelectricity.api.electricity.IVoltageInput; import universalelectricity.api.energy.EnergyStorageHandler; import universalelectricity.api.energy.IEnergyInterface; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.network.Player; @@ -153,8 +153,8 @@ public class TileAccelerator extends TileElectricalInventory implements IElectro if (getStackInSlot(0) != null && lastSpawnTick >= 40) { Vector3 spawn_vec = new Vector3(this); - spawn_vec.translate(getDirection().getOpposite()); - spawn_vec.translate(0.5f); + spawn_vec.add(getDirection().getOpposite()); + spawn_vec.add(0.5f); // Only render the particle if container within the proper environment for it. if (EntityParticle.canSpawnParticle(worldObj, spawn_vec)) diff --git a/src/main/scala/resonantinduction/atomic/machine/boiler/TileNuclearBoiler.java b/src/main/scala/resonantinduction/atomic/machine/boiler/TileNuclearBoiler.java index 6338ae15c..e0826e570 100644 --- a/src/main/scala/resonantinduction/atomic/machine/boiler/TileNuclearBoiler.java +++ b/src/main/scala/resonantinduction/atomic/machine/boiler/TileNuclearBoiler.java @@ -6,7 +6,7 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/scala/resonantinduction/atomic/machine/centrifuge/TileCentrifuge.java b/src/main/scala/resonantinduction/atomic/machine/centrifuge/TileCentrifuge.java index c856e3329..c10b89064 100644 --- a/src/main/scala/resonantinduction/atomic/machine/centrifuge/TileCentrifuge.java +++ b/src/main/scala/resonantinduction/atomic/machine/centrifuge/TileCentrifuge.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; @@ -22,7 +22,7 @@ import resonantinduction.core.Settings; import universalelectricity.api.CompatibilityModule; import universalelectricity.api.electricity.IVoltageInput; import universalelectricity.api.energy.EnergyStorageHandler; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import universalelectricity.api.vector.VectorHelper; import com.google.common.io.ByteArrayDataInput; diff --git a/src/main/scala/resonantinduction/atomic/machine/extractor/TileChemicalExtractor.java b/src/main/scala/resonantinduction/atomic/machine/extractor/TileChemicalExtractor.java index 40808e52e..0ba180cb8 100644 --- a/src/main/scala/resonantinduction/atomic/machine/extractor/TileChemicalExtractor.java +++ b/src/main/scala/resonantinduction/atomic/machine/extractor/TileChemicalExtractor.java @@ -6,7 +6,7 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; diff --git a/src/main/scala/resonantinduction/atomic/machine/extractor/turbine/TileElectricTurbine.java b/src/main/scala/resonantinduction/atomic/machine/extractor/turbine/TileElectricTurbine.java index fcc367bbf..80f113ee1 100644 --- a/src/main/scala/resonantinduction/atomic/machine/extractor/turbine/TileElectricTurbine.java +++ b/src/main/scala/resonantinduction/atomic/machine/extractor/turbine/TileElectricTurbine.java @@ -1,6 +1,6 @@ package resonantinduction.atomic.machine.extractor.turbine; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import resonant.api.IBoilHandler; import resonant.lib.prefab.turbine.TileTurbine; diff --git a/src/main/scala/resonantinduction/atomic/machine/extractor/turbine/TileFunnel.java b/src/main/scala/resonantinduction/atomic/machine/extractor/turbine/TileFunnel.java index d6c8bc126..6d0e6931c 100644 --- a/src/main/scala/resonantinduction/atomic/machine/extractor/turbine/TileFunnel.java +++ b/src/main/scala/resonantinduction/atomic/machine/extractor/turbine/TileFunnel.java @@ -1,11 +1,11 @@ package resonantinduction.atomic.machine.extractor.turbine; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; -import net.minecraftforge.common.ForgeDirection; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; @@ -23,7 +23,7 @@ import cpw.mods.fml.relauncher.SideOnly; /** Funnel for gas. */ public class TileFunnel extends TileBase implements IBoilHandler { - private static Icon iconTop; + private static IIcon iconTop; private final FluidTank tank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * 16); public TileFunnel() @@ -33,14 +33,14 @@ public class TileFunnel extends TileBase implements IBoilHandler } @Override - public Icon getIcon(int side, int meta) + public IIcon getIcon(int side, int meta) { return side == 1 || side == 0 ? iconTop : super.getIcon(side, meta); } @SideOnly(Side.CLIENT) @Override - public void registerIcons(IconRegister iconRegister) + public void registerIcons(IIconRegister iconRegister) { super.registerIcons(iconRegister); iconTop = iconRegister.registerIcon(domain + name + "_top"); diff --git a/src/main/scala/resonantinduction/atomic/machine/fulmination/FulminationHandler.java b/src/main/scala/resonantinduction/atomic/machine/fulmination/FulminationHandler.java index cf415f773..0db692ac7 100644 --- a/src/main/scala/resonantinduction/atomic/machine/fulmination/FulminationHandler.java +++ b/src/main/scala/resonantinduction/atomic/machine/fulmination/FulminationHandler.java @@ -9,7 +9,7 @@ import net.minecraft.util.Vec3; import net.minecraftforge.event.ForgeSubscribe; import resonant.api.explosion.ExplosionEvent.DoExplosionEvent; import resonantinduction.atomic.Atomic; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; /** Atomic Science Event Handling. */ public class FulminationHandler @@ -47,7 +47,7 @@ public class FulminationHandler if (!tileEntity.isInvalid()) { Vector3 tileDiDian = new Vector3(tileEntity); - tileDiDian.translate(0.5f); + tileDiDian.add(0.5f); double juLi = tileDiDian.distance(new Vector3(evt.x, evt.y, evt.z)); if (juLi <= evt.iExplosion.getRadius() && juLi > 0) diff --git a/src/main/scala/resonantinduction/atomic/machine/fulmination/TileFulmination.java b/src/main/scala/resonantinduction/atomic/machine/fulmination/TileFulmination.java index 926518c72..4d13c4f19 100644 --- a/src/main/scala/resonantinduction/atomic/machine/fulmination/TileFulmination.java +++ b/src/main/scala/resonantinduction/atomic/machine/fulmination/TileFulmination.java @@ -3,7 +3,7 @@ package resonantinduction.atomic.machine.fulmination; import java.util.EnumSet; import net.minecraft.block.material.Material; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.utility.ConnectedTextureRenderer; import resonant.lib.content.module.TileRender; import resonant.lib.prefab.tile.TileElectrical; diff --git a/src/main/scala/resonantinduction/atomic/machine/plasma/BlockPlasmaHeater.java b/src/main/scala/resonantinduction/atomic/machine/plasma/BlockPlasmaHeater.java index 4ce414b89..d083f3fb6 100644 --- a/src/main/scala/resonantinduction/atomic/machine/plasma/BlockPlasmaHeater.java +++ b/src/main/scala/resonantinduction/atomic/machine/plasma/BlockPlasmaHeater.java @@ -1,6 +1,6 @@ package resonantinduction.atomic.machine.plasma; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasma.java b/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasma.java index fde393bf1..8a5bc9dac 100644 --- a/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasma.java +++ b/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasma.java @@ -9,14 +9,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.DamageSource; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.MinecraftForge; import resonant.api.event.PlasmaEvent.SpawnPlasmaEvent; import resonant.lib.config.Config; import resonant.lib.content.module.TileBase; import resonant.lib.prefab.vector.Cuboid; import resonant.lib.thermal.ThermalGrid; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import universalelectricity.api.vector.VectorWorld; public class TilePlasma extends TileBase @@ -93,7 +93,7 @@ public class TilePlasma extends TileBase } Vector3 diDian = new Vector3(this); - diDian.translate(ForgeDirection.getOrientation(i)); + diDian.add(ForgeDirection.getOrientation(i)); TileEntity tileEntity = diDian.getTileEntity(worldObj); diff --git a/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasmaHeater.java b/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasmaHeater.java index 147b74243..e0a84e224 100644 --- a/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasmaHeater.java +++ b/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasmaHeater.java @@ -6,7 +6,7 @@ import atomic.Atomic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; @@ -23,7 +23,7 @@ import resonantinduction.core.ResonantInduction; import universalelectricity.api.energy.EnergyStorageHandler; import universalelectricity.api.energy.UnitDisplay; import universalelectricity.api.energy.UnitDisplay.Unit; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import com.google.common.io.ByteArrayDataInput; diff --git a/src/main/scala/resonantinduction/atomic/machine/quantum/TileQuantumAssembler.java b/src/main/scala/resonantinduction/atomic/machine/quantum/TileQuantumAssembler.java index 3121670df..bb1a91423 100644 --- a/src/main/scala/resonantinduction/atomic/machine/quantum/TileQuantumAssembler.java +++ b/src/main/scala/resonantinduction/atomic/machine/quantum/TileQuantumAssembler.java @@ -7,7 +7,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.recipe.QuantumAssemblerRecipes; import resonant.lib.network.IPacketReceiver; import resonant.lib.prefab.tile.TileElectricalInventory; @@ -16,7 +16,7 @@ import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import universalelectricity.api.electricity.IVoltageInput; import universalelectricity.api.energy.EnergyStorageHandler; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import com.google.common.io.ByteArrayDataInput; @@ -132,7 +132,7 @@ public class TileQuantumAssembler extends TileElectricalInventory implements IPa } //Animation frame update - this.rotation.translate(3, 2, 1); + this.rotation.add(3, 2, 1); } } diff --git a/src/main/scala/resonantinduction/atomic/machine/reactor/BlockReactorDrain.java b/src/main/scala/resonantinduction/atomic/machine/reactor/BlockReactorDrain.java index f4e1c504e..be5b89304 100644 --- a/src/main/scala/resonantinduction/atomic/machine/reactor/BlockReactorDrain.java +++ b/src/main/scala/resonantinduction/atomic/machine/reactor/BlockReactorDrain.java @@ -1,10 +1,10 @@ package resonantinduction.atomic.machine.reactor; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import resonant.lib.prefab.block.BlockRotatable; @@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly; /** Reactor tap block */ public class BlockReactorDrain extends BlockRotatable { - private Icon frontIcon; + private IIcon frontIcon; public BlockReactorDrain(int id) { @@ -46,7 +46,7 @@ public class BlockReactorDrain extends BlockRotatable } @Override - public Icon getIcon(int side, int metadata) + public IIcon getIcon(int side, int metadata) { if (side == metadata) { @@ -57,7 +57,7 @@ public class BlockReactorDrain extends BlockRotatable @SideOnly(Side.CLIENT) @Override - public void registerIcons(IconRegister iconRegister) + public void registerIcons(IIconRegister iconRegister) { super.registerIcons(iconRegister); this.frontIcon = iconRegister.registerIcon(this.getUnlocalizedName().replace("tile.", "") + "_front"); diff --git a/src/main/scala/resonantinduction/atomic/machine/reactor/TileControlRod.java b/src/main/scala/resonantinduction/atomic/machine/reactor/TileControlRod.java index 9d2c362ec..6fd78b776 100644 --- a/src/main/scala/resonantinduction/atomic/machine/reactor/TileControlRod.java +++ b/src/main/scala/resonantinduction/atomic/machine/reactor/TileControlRod.java @@ -1,11 +1,11 @@ package resonantinduction.atomic.machine.reactor; import net.minecraft.block.material.Material; -import resonant.lib.content.module.TileBlock; +import resonant.content.spatial.block.SpatialBlock; import resonant.lib.prefab.vector.Cuboid; /** Control rod block */ -public class TileControlRod extends TileBlock +public class TileControlRod extends SpatialBlock { public TileControlRod() { diff --git a/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorCell.java b/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorCell.java index bc55f7793..ed5d05d03 100644 --- a/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorCell.java +++ b/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorCell.java @@ -17,7 +17,7 @@ import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -45,7 +45,7 @@ import resonantinduction.atomic.machine.plasma.TilePlasma; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import universalelectricity.api.UniversalElectricity; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import universalelectricity.api.vector.VectorWorld; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -182,8 +182,8 @@ public class TileReactorCell extends TileInventory implements IMultiBlockStructu if (drain != null && drain.amount >= FluidContainerRegistry.BUCKET_VOLUME) { ForgeDirection spawnDir = ForgeDirection.getOrientation(worldObj.rand.nextInt(3) + 2); - Vector3 spawnPos = new Vector3(this).translate(spawnDir, 2); - spawnPos.translate(0, Math.max(worldObj.rand.nextInt(getHeight()) - 1, 0), 0); + Vector3 spawnPos = new Vector3(this).add(spawnDir, 2); + spawnPos.add(0, Math.max(worldObj.rand.nextInt(getHeight()) - 1, 0), 0); if (worldObj.isAirBlock(spawnPos.intX(), spawnPos.intY(), spawnPos.intZ())) { @@ -243,9 +243,9 @@ public class TileReactorCell extends TileInventory implements IMultiBlockStructu for (int i = 2; i < 6; i++) { - Vector3 checkAdjacent = new Vector3(this).translate(ForgeDirection.getOrientation(i)); + Vector3 checkAdjacent = new Vector3(this).add(ForgeDirection.getOrientation(i)); - if (checkAdjacent.getBlockID(worldObj) == Atomic.blockControlRod.blockID) + if (checkAdjacent.getBlock(worldObj) == Atomic.blockControlRod.blockID) { deltaT /= 1.1; rods++; @@ -308,9 +308,9 @@ public class TileReactorCell extends TileInventory implements IMultiBlockStructu if (isOverToxic()) { /** Randomly leak toxic waste when it is too toxic */ - VectorWorld leakPos = new VectorWorld(this).translate(worldObj.rand.nextInt(20) - 10, worldObj.rand.nextInt(20) - 10, worldObj.rand.nextInt(20) - 10); + VectorWorld leakPos = new VectorWorld(this).add(worldObj.rand.nextInt(20) - 10, worldObj.rand.nextInt(20) - 10, worldObj.rand.nextInt(20) - 10); - int blockID = leakPos.getBlockID(); + int blockID = leakPos.getBlock(); if (blockID == Block.grass.blockID) { @@ -321,7 +321,7 @@ public class TileReactorCell extends TileInventory implements IMultiBlockStructu { if (tank.getFluid() != null) { - leakPos.setBlock(worldObj, tank.getFluid().getFluid().getBlockID()); + leakPos.setBlock(worldObj, tank.getFluid().getFluid().getBlock()); tank.drain(FluidContainerRegistry.BUCKET_VOLUME, true); } } diff --git a/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorDrain.java b/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorDrain.java index a94c27a61..b243b3175 100644 --- a/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorDrain.java +++ b/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorDrain.java @@ -9,7 +9,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockFluid; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; @@ -19,7 +19,7 @@ import net.minecraftforge.fluids.IFluidTank; import resonant.lib.path.IPathCallBack; import resonant.lib.path.Pathfinder; import resonant.lib.prefab.tile.TileAdvanced; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; /** Reactor Drain * @@ -45,8 +45,8 @@ public class TileReactorDrain extends TileAdvanced implements IFluidHandler for (int i = 0; i < 6; i++) { ForgeDirection direction = ForgeDirection.getOrientation(i); - Vector3 position = currentNode.clone().translate(direction); - int connectedBlockID = position.getBlockID(world); + Vector3 position = currentNode.clone().add(direction); + int connectedBlockID = position.getBlock(world); if (connectedBlockID == 0 || Block.blocksList[connectedBlockID] instanceof BlockFluid || Block.blocksList[connectedBlockID] instanceof IFluidBlock || position.getTileEntity(world) instanceof TileReactorCell) { @@ -72,7 +72,7 @@ public class TileReactorDrain extends TileAdvanced implements IFluidHandler return false; } - }).init(new Vector3(this).translate(ForgeDirection.getOrientation(this.getBlockMetadata()).getOpposite())); + }).init(new Vector3(this).add(ForgeDirection.getOrientation(this.getBlockMetadata()).getOpposite())); for (Vector3 node : finder.results) { diff --git a/src/main/scala/resonantinduction/atomic/machine/thermometer/ItemBlockThermometer.java b/src/main/scala/resonantinduction/atomic/machine/thermometer/ItemBlockThermometer.java index 664266add..9e157eadd 100644 --- a/src/main/scala/resonantinduction/atomic/machine/thermometer/ItemBlockThermometer.java +++ b/src/main/scala/resonantinduction/atomic/machine/thermometer/ItemBlockThermometer.java @@ -9,7 +9,7 @@ import net.minecraft.world.World; import resonant.lib.prefab.item.ItemBlockSaved; import resonant.lib.utility.LanguageUtility; import resonant.lib.utility.nbt.NBTUtility; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; /** Handheld thermometer */ public class ItemBlockThermometer extends ItemBlockSaved diff --git a/src/main/scala/resonantinduction/atomic/machine/thermometer/TileThermometer.java b/src/main/scala/resonantinduction/atomic/machine/thermometer/TileThermometer.java index 99ef4dfe5..c921e2980 100644 --- a/src/main/scala/resonantinduction/atomic/machine/thermometer/TileThermometer.java +++ b/src/main/scala/resonantinduction/atomic/machine/thermometer/TileThermometer.java @@ -7,12 +7,12 @@ import li.cil.oc.api.network.Callback; import li.cil.oc.api.network.Context; import li.cil.oc.api.network.SimpleComponent; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import resonant.lib.content.module.TileBase; import resonant.lib.network.PacketHandler; @@ -22,7 +22,7 @@ import resonant.lib.thermal.ThermalGrid; import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import universalelectricity.api.vector.VectorWorld; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; @@ -36,7 +36,7 @@ import dan200.computercraft.api.peripheral.IPeripheral; public class TileThermometer extends TileBase implements IPeripheral, SimpleComponent { public static final int MAX_THRESHOLD = 5000; - private static Icon iconSide; + private static IIcon iconSide; @Synced public float detectedTemperature = 295; @@ -63,14 +63,14 @@ public class TileThermometer extends TileBase implements IPeripheral, SimpleComp } @Override - public Icon getIcon(int side, int meta) + public IIcon getIcon(int side, int meta) { return side == 1 || side == 0 ? super.getIcon(side, meta) : iconSide; } @SideOnly(Side.CLIENT) @Override - public void registerIcons(IconRegister iconRegister) + public void registerIcons(IIconRegister iconRegister) { super.registerIcons(iconRegister); iconSide = iconRegister.registerIcon(Reference.PREFIX + "machine"); diff --git a/src/main/scala/resonantinduction/atomic/schematic/SchematicAccelerator.java b/src/main/scala/resonantinduction/atomic/schematic/SchematicAccelerator.java index a73130033..faac428da 100644 --- a/src/main/scala/resonantinduction/atomic/schematic/SchematicAccelerator.java +++ b/src/main/scala/resonantinduction/atomic/schematic/SchematicAccelerator.java @@ -3,10 +3,10 @@ package resonantinduction.atomic.schematic; import java.util.HashMap; import atomic.Atomic; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.schematic.Schematic; import resonant.lib.type.Pair; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; public class SchematicAccelerator extends Schematic { diff --git a/src/main/scala/resonantinduction/atomic/schematic/SchematicBreedingReactor.java b/src/main/scala/resonantinduction/atomic/schematic/SchematicBreedingReactor.java index ebe4a6e6d..4aa38b1fb 100644 --- a/src/main/scala/resonantinduction/atomic/schematic/SchematicBreedingReactor.java +++ b/src/main/scala/resonantinduction/atomic/schematic/SchematicBreedingReactor.java @@ -3,11 +3,11 @@ package resonantinduction.atomic.schematic; import java.util.HashMap; import net.minecraft.block.Block; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.schematic.Schematic; import resonant.lib.type.Pair; import atomic.Atomic; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; public class SchematicBreedingReactor extends Schematic { diff --git a/src/main/scala/resonantinduction/atomic/schematic/SchematicFissionReactor.java b/src/main/scala/resonantinduction/atomic/schematic/SchematicFissionReactor.java index 89409cc59..e0b38b0a4 100644 --- a/src/main/scala/resonantinduction/atomic/schematic/SchematicFissionReactor.java +++ b/src/main/scala/resonantinduction/atomic/schematic/SchematicFissionReactor.java @@ -4,10 +4,10 @@ import java.util.HashMap; import atomic.Atomic; import net.minecraft.block.Block; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.schematic.Schematic; import resonant.lib.type.Pair; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; public class SchematicFissionReactor extends Schematic { @@ -91,7 +91,7 @@ public class SchematicFissionReactor extends Schematic } } - returnMap.put(targetPosition.clone().translate(offset), new Pair(Block.pistonStickyBase.blockID, rotationMetadata)); + returnMap.put(targetPosition.clone().add(offset), new Pair(Block.pistonStickyBase.blockID, rotationMetadata)); } else if (x == -r || x == r || z == -r || z == r) { diff --git a/src/main/scala/resonantinduction/atomic/schematic/SchematicFusionReactor.java b/src/main/scala/resonantinduction/atomic/schematic/SchematicFusionReactor.java index cfabcc3c7..a6b07bd0f 100644 --- a/src/main/scala/resonantinduction/atomic/schematic/SchematicFusionReactor.java +++ b/src/main/scala/resonantinduction/atomic/schematic/SchematicFusionReactor.java @@ -3,10 +3,10 @@ package resonantinduction.atomic.schematic; import java.util.HashMap; import atomic.Atomic; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.schematic.Schematic; import resonant.lib.type.Pair; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; public class SchematicFusionReactor extends Schematic { @@ -45,7 +45,7 @@ public class SchematicFusionReactor extends Schematic if (magnitude >= 1) { double yDeviation = (y == 0 ? size / 3 : -size / 3) + (y == 0 ? -1 : 1) * Math.sin(magnitude / radius * Math.PI) * size / 2d; - Vector3 newPos = position.clone().translate(0, yDeviation, 0); + Vector3 newPos = position.clone().add(0, yDeviation, 0); returnMap.put(newPos.round(), new Pair(Atomic.blockElectromagnet.blockID, 1)); } } diff --git a/src/main/scala/resonantinduction/core/ClientProxy.java b/src/main/scala/resonantinduction/core/ClientProxy.java index 229cc89cc..68f0c97f2 100644 --- a/src/main/scala/resonantinduction/core/ClientProxy.java +++ b/src/main/scala/resonantinduction/core/ClientProxy.java @@ -10,7 +10,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import resonant.lib.render.fx.FxLaser; import universalelectricity.api.vector.IVector3; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/scala/resonantinduction/core/CommandMachine.java b/src/main/scala/resonantinduction/core/CommandMachine.java index e4a884054..5d86529e4 100644 --- a/src/main/scala/resonantinduction/core/CommandMachine.java +++ b/src/main/scala/resonantinduction/core/CommandMachine.java @@ -9,7 +9,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatMessageComponent; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; diff --git a/src/main/scala/resonantinduction/core/CommonProxy.java b/src/main/scala/resonantinduction/core/CommonProxy.java index 9385b5a07..783fcc3f3 100644 --- a/src/main/scala/resonantinduction/core/CommonProxy.java +++ b/src/main/scala/resonantinduction/core/CommonProxy.java @@ -8,7 +8,7 @@ import java.awt.Color; import net.minecraft.world.World; import resonant.lib.prefab.ProxyBase; import universalelectricity.api.vector.IVector3; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; /** @author Calclavia */ public class CommonProxy extends ProxyBase diff --git a/src/main/scala/resonantinduction/core/MultipartUtility.java b/src/main/scala/resonantinduction/core/MultipartUtility.java index 8267033c7..95cb722d5 100644 --- a/src/main/scala/resonantinduction/core/MultipartUtility.java +++ b/src/main/scala/resonantinduction/core/MultipartUtility.java @@ -5,9 +5,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import universalelectricity.api.vector.VectorWorld; import codechicken.lib.vec.BlockCoord; import codechicken.multipart.TMultiPart; diff --git a/src/main/scala/resonantinduction/core/blocks/BlockIndustrialStone.java b/src/main/scala/resonantinduction/core/blocks/BlockIndustrialStone.java index 030033f76..2083f7b8e 100644 --- a/src/main/scala/resonantinduction/core/blocks/BlockIndustrialStone.java +++ b/src/main/scala/resonantinduction/core/blocks/BlockIndustrialStone.java @@ -4,10 +4,10 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import resonant.lib.prefab.block.BlockTile; import resonantinduction.core.Reference; @@ -20,7 +20,7 @@ import resonantinduction.core.Reference; public class BlockIndustrialStone extends BlockTile { String[] iconNames = new String[] { "material_stone_brick", "material_stone_brick2", "material_stone_chiseled", "material_stone_cobble", "material_stone_cracked", "material_stone", "material_stone_slab", "material_stone_mossy", "material_steel_dark", "material_steel_tint", "material_steel" }; - Icon[] icons = new Icon[iconNames.length]; + IIcon[] icons = new IIcon[iconNames.length]; public BlockIndustrialStone(int id) { @@ -36,18 +36,18 @@ public class BlockIndustrialStone extends BlockTile } @Override - public Icon getIcon(int side, int metadata) + public IIcon getIcon(int side, int metadata) { return icons[metadata]; } @Override - public void registerIcons(IconRegister par1IconRegister) + public void registerIcons(IIconRegister par1IIconRegister) { - this.blockIcon = par1IconRegister.registerIcon(this.getTextureName()); + this.blockIcon = par1IIconRegister.registerIcon(this.getTextureName()); for (int i = 0; i < iconNames.length; i++) - icons[i] = par1IconRegister.registerIcon(Reference.PREFIX + iconNames[i]); + icons[i] = par1IIconRegister.registerIcon(Reference.PREFIX + iconNames[i]); } @Override diff --git a/src/main/scala/resonantinduction/core/debug/FrameNodeDebug.java b/src/main/scala/resonantinduction/core/debug/FrameNodeDebug.java index fbb3739c6..ddc68f479 100644 --- a/src/main/scala/resonantinduction/core/debug/FrameNodeDebug.java +++ b/src/main/scala/resonantinduction/core/debug/FrameNodeDebug.java @@ -2,7 +2,7 @@ package resonantinduction.core.debug; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.grid.INode; import resonant.api.grid.INodeProvider; import codechicken.multipart.TMultiPart; diff --git a/src/main/scala/resonantinduction/core/grid/TraitNodeProvider.java b/src/main/scala/resonantinduction/core/grid/TraitNodeProvider.java index c1da869cb..a1c50ed50 100644 --- a/src/main/scala/resonantinduction/core/grid/TraitNodeProvider.java +++ b/src/main/scala/resonantinduction/core/grid/TraitNodeProvider.java @@ -1,6 +1,6 @@ package resonantinduction.core.grid; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.grid.INode; import resonant.api.grid.INodeProvider; import codechicken.multipart.PartMap; diff --git a/src/main/scala/resonantinduction/core/grid/fluid/FluidDistributionetwork.java b/src/main/scala/resonantinduction/core/grid/fluid/FluidDistributionetwork.java index e8099b3a1..90e71bd5b 100644 --- a/src/main/scala/resonantinduction/core/grid/fluid/FluidDistributionetwork.java +++ b/src/main/scala/resonantinduction/core/grid/fluid/FluidDistributionetwork.java @@ -1,6 +1,6 @@ package resonantinduction.core.grid.fluid; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; diff --git a/src/main/scala/resonantinduction/core/grid/fluid/FluidPressureNode.java b/src/main/scala/resonantinduction/core/grid/fluid/FluidPressureNode.java index 5c85ab96a..1ae57834b 100644 --- a/src/main/scala/resonantinduction/core/grid/fluid/FluidPressureNode.java +++ b/src/main/scala/resonantinduction/core/grid/fluid/FluidPressureNode.java @@ -7,13 +7,13 @@ import java.util.Map.Entry; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.IFluidHandler; import resonant.lib.grid.Node; import resonant.lib.grid.TickingGrid; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import codechicken.multipart.TMultiPart; @SuppressWarnings("deprecation") @@ -210,7 +210,7 @@ public class FluidPressureNode extends Node materials = HashBiMap.create(); static final HashMap materialColorCache = new HashMap(); - static final HashMap iconColorCache = new HashMap(); + static final HashMap iconColorCache = new HashMap(); static { @@ -249,7 +249,7 @@ public class ResourceGenerator implements IVirtualObject try { - Icon icon = item.getIconIndex(itemStack); + IIcon icon = item.getIconIndex(itemStack); if (iconColorCache.containsKey(icon)) { diff --git a/src/main/scala/resonantinduction/electrical/ClientProxy.java b/src/main/scala/resonantinduction/electrical/ClientProxy.java index 5a1503fb2..74fa06cb2 100644 --- a/src/main/scala/resonantinduction/electrical/ClientProxy.java +++ b/src/main/scala/resonantinduction/electrical/ClientProxy.java @@ -19,8 +19,8 @@ import resonantinduction.electrical.render.FXElectricBolt; import resonantinduction.electrical.tesla.RenderTesla; import resonantinduction.electrical.tesla.TileTesla; import resonantinduction.electrical.transformer.RenderTransformer; -import resonantinduction.quantum.gate.RenderQuantumGlyph; -import universalelectricity.api.vector.Vector3; +import resonantinduction.atomic.gate.RenderQuantumGlyph; +import universalelectricity.core.transform.vector.Vector3; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; import cpw.mods.fml.client.FMLClientHandler; diff --git a/src/main/scala/resonantinduction/electrical/CommonProxy.java b/src/main/scala/resonantinduction/electrical/CommonProxy.java index e985b805f..28601ab7e 100644 --- a/src/main/scala/resonantinduction/electrical/CommonProxy.java +++ b/src/main/scala/resonantinduction/electrical/CommonProxy.java @@ -10,7 +10,7 @@ import resonantinduction.electrical.encoder.TileEncoder; import resonantinduction.electrical.encoder.gui.ContainerEncoder; import resonantinduction.electrical.multimeter.ContainerMultimeter; import resonantinduction.electrical.multimeter.PartMultimeter; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; diff --git a/src/main/scala/resonantinduction/electrical/Electrical.java b/src/main/scala/resonantinduction/electrical/Electrical.java index 3eac03305..2a622def2 100644 --- a/src/main/scala/resonantinduction/electrical/Electrical.java +++ b/src/main/scala/resonantinduction/electrical/Electrical.java @@ -35,7 +35,7 @@ import resonantinduction.electrical.tesla.TileTesla; import resonantinduction.electrical.transformer.ItemTransformer; import resonantinduction.electrical.wire.EnumWireMaterial; import resonantinduction.electrical.wire.ItemWire; -import resonantinduction.quantum.gate.ItemQuantumGlyph; +import resonantinduction.atomic.gate.ItemQuantumGlyph; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; diff --git a/src/main/scala/resonantinduction/electrical/MultipartElectrical.java b/src/main/scala/resonantinduction/electrical/MultipartElectrical.java index 762887678..d5d84b1e9 100644 --- a/src/main/scala/resonantinduction/electrical/MultipartElectrical.java +++ b/src/main/scala/resonantinduction/electrical/MultipartElectrical.java @@ -9,7 +9,7 @@ import resonantinduction.electrical.wire.flat.PartFlatSwitchWire; import resonantinduction.electrical.wire.flat.PartFlatWire; import resonantinduction.electrical.wire.framed.PartFramedSwitchWire; import resonantinduction.electrical.wire.framed.PartFramedWire; -import resonantinduction.quantum.gate.PartQuantumGlyph; +import resonantinduction.atomic.gate.PartQuantumGlyph; import codechicken.multipart.MultiPartRegistry; import codechicken.multipart.MultiPartRegistry.IPartFactory; import codechicken.multipart.MultipartGenerator; diff --git a/src/main/scala/resonantinduction/electrical/armbot/IArmbot.java b/src/main/scala/resonantinduction/electrical/armbot/IArmbot.java index 6cf1d627d..239930d40 100644 --- a/src/main/scala/resonantinduction/electrical/armbot/IArmbot.java +++ b/src/main/scala/resonantinduction/electrical/armbot/IArmbot.java @@ -1,9 +1,9 @@ package resonantinduction.electrical.armbot; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonantinduction.electrical.encoder.coding.IProgrammableMachine; import universalelectricity.api.vector.Vector2; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; /** Should be used to interact with the armbot and not to create a new armbot */ public interface IArmbot extends Cloneable, IProgrammableMachine diff --git a/src/main/scala/resonantinduction/electrical/armbot/RenderArmbot.java b/src/main/scala/resonantinduction/electrical/armbot/RenderArmbot.java index d6e267b03..bd53b2740 100644 --- a/src/main/scala/resonantinduction/electrical/armbot/RenderArmbot.java +++ b/src/main/scala/resonantinduction/electrical/armbot/RenderArmbot.java @@ -17,7 +17,7 @@ import org.lwjgl.opengl.GL11; import resonant.api.items.ISimpleItemRenderer; import resonant.lib.render.RenderUtility; import resonantinduction.core.Reference; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/scala/resonantinduction/electrical/armbot/TileArmbot.java b/src/main/scala/resonantinduction/electrical/armbot/TileArmbot.java index 90e39d197..568ac61ad 100644 --- a/src/main/scala/resonantinduction/electrical/armbot/TileArmbot.java +++ b/src/main/scala/resonantinduction/electrical/armbot/TileArmbot.java @@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.multiblock.IMultiBlock; import resonant.lib.network.IPacketReceiverWithID; import resonant.lib.network.PacketHandler; @@ -26,7 +26,7 @@ import resonantinduction.electrical.encoder.coding.IProgram; import resonantinduction.electrical.encoder.coding.ProgramHelper; import universalelectricity.api.energy.EnergyStorageHandler; import universalelectricity.api.vector.Vector2; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import com.google.common.io.ByteArrayDataInput; @@ -110,7 +110,7 @@ public class TileArmbot extends TileElectrical implements IMultiBlock, IArmbot, this.programHelper.onUpdate(this.worldObj, new Vector3(this)); if (this.targetYaw != preYaw || this.targetPitch != prePitch) { - PacketHandler.sendPacketToClients(this.getDescriptionPacket(), worldObj, new Vector3(this).translate(new Vector3(.5f, 1f, .5f)), 64); + PacketHandler.sendPacketToClients(this.getDescriptionPacket(), worldObj, new Vector3(this).add(new Vector3(.5f, 1f, .5f)), 64); } } this.updateRotation(); @@ -377,8 +377,8 @@ public class TileArmbot extends TileElectrical implements IMultiBlock, IArmbot, public Vector3 getHandPos() { Vector3 position = new Vector3(this); - position.translate(0.5); - position.translate(this.getDeltaHandPosition()); + position.add(0.5); + position.add(this.getDeltaHandPosition()); return position; } diff --git a/src/main/scala/resonantinduction/electrical/armbot/task/TaskBreak.java b/src/main/scala/resonantinduction/electrical/armbot/task/TaskBreak.java index 219c5d412..78884cad9 100644 --- a/src/main/scala/resonantinduction/electrical/armbot/task/TaskBreak.java +++ b/src/main/scala/resonantinduction/electrical/armbot/task/TaskBreak.java @@ -13,7 +13,7 @@ import resonantinduction.electrical.armbot.IArmbot; import resonantinduction.electrical.armbot.TaskBaseArmbot; import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.electrical.encoder.coding.ITask; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; /** * Used by arms to break a specific block in a position. @@ -44,7 +44,7 @@ public class TaskBreak extends TaskBaseArmbot Vector3 serachPosition = ((IArmbot) this.program.getMachine()).getHandPos(); Pair location = this.program.getMachine().getLocation(); - Block block = Block.blocksList[serachPosition.getBlockID(location.left())]; + Block block = Block.blocksList[serachPosition.getBlock(location.left())]; this.breakTicks--; if (block != null && breakTicks <= 0) { diff --git a/src/main/scala/resonantinduction/electrical/armbot/task/TaskFire.java b/src/main/scala/resonantinduction/electrical/armbot/task/TaskFire.java index b7dc860df..c85ff9992 100644 --- a/src/main/scala/resonantinduction/electrical/armbot/task/TaskFire.java +++ b/src/main/scala/resonantinduction/electrical/armbot/task/TaskFire.java @@ -15,7 +15,7 @@ import resonantinduction.electrical.armbot.IArmbot; import resonantinduction.electrical.armbot.TaskBaseArmbot; import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.electrical.encoder.coding.args.ArgumentFloatData; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; public class TaskFire extends TaskBaseArmbot { diff --git a/src/main/scala/resonantinduction/electrical/armbot/task/TaskGive.java b/src/main/scala/resonantinduction/electrical/armbot/task/TaskGive.java index 8a4ffb631..25f83e755 100644 --- a/src/main/scala/resonantinduction/electrical/armbot/task/TaskGive.java +++ b/src/main/scala/resonantinduction/electrical/armbot/task/TaskGive.java @@ -7,7 +7,7 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.science.units.UnitHelper; import resonant.lib.utility.MathUtility; import resonant.lib.utility.inventory.InternalInventoryHandler; @@ -16,7 +16,7 @@ import resonantinduction.electrical.armbot.TaskBaseArmbot; import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.electrical.encoder.coding.args.ArgumentIntData; import universalelectricity.api.vector.Vector2; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; public class TaskGive extends TaskBaseArmbot { diff --git a/src/main/scala/resonantinduction/electrical/armbot/task/TaskGrabPrefab.java b/src/main/scala/resonantinduction/electrical/armbot/task/TaskGrabPrefab.java index 9a02f3014..318b05e86 100644 --- a/src/main/scala/resonantinduction/electrical/armbot/task/TaskGrabPrefab.java +++ b/src/main/scala/resonantinduction/electrical/armbot/task/TaskGrabPrefab.java @@ -1,12 +1,12 @@ package resonantinduction.electrical.armbot.task; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.IEntityConveyor; import resonantinduction.electrical.armbot.IArmbot; import resonantinduction.electrical.armbot.TaskBaseArmbot; import universalelectricity.api.vector.Vector2; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; /** * Prefab for grab based commands @@ -35,7 +35,7 @@ public abstract class TaskGrabPrefab extends TaskBaseArmbot TileEntity entity = this.armPos.getTileEntity(this.program.getMachine().getLocation().left()); if (entity == null) { - entity = this.armPos.clone().translate(new Vector3(ForgeDirection.DOWN)).getTileEntity(this.program.getMachine().getLocation().left()); + entity = this.armPos.clone().add(new Vector3(ForgeDirection.DOWN)).getTileEntity(this.program.getMachine().getLocation().left()); } if (entity instanceof IEntityConveyor) { diff --git a/src/main/scala/resonantinduction/electrical/armbot/task/TaskPlace.java b/src/main/scala/resonantinduction/electrical/armbot/task/TaskPlace.java index 9a66aca27..4860d911f 100644 --- a/src/main/scala/resonantinduction/electrical/armbot/task/TaskPlace.java +++ b/src/main/scala/resonantinduction/electrical/armbot/task/TaskPlace.java @@ -4,12 +4,12 @@ import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.IPlantable; import resonantinduction.electrical.armbot.IArmbot; import resonantinduction.electrical.armbot.TaskBaseArmbot; import resonantinduction.electrical.armbot.TaskBaseProcess; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; /** * Used by arms to break a specific block in a position. @@ -33,7 +33,7 @@ public class TaskPlace extends TaskBaseArmbot { Vector3 serachPosition = ((IArmbot) this.program.getMachine()).getHandPos(); - Block block = Block.blocksList[serachPosition.getBlockID(this.program.getMachine().getLocation().left())]; + Block block = Block.blocksList[serachPosition.getBlock(this.program.getMachine().getLocation().left())]; if (block == null && ticks >= this.PLACE_TIME) { @@ -59,7 +59,7 @@ public class TaskPlace extends TaskBaseArmbot else if (itemStack.getItem() instanceof IPlantable) { IPlantable plantable = ((IPlantable) itemStack.getItem()); - Block blockBelow = Block.blocksList[Vector3.translate(serachPosition, new Vector3(0, -1, 0)).getBlockID(this.program.getMachine().getLocation().left())]; + Block blockBelow = Block.blocksList[Vector3.add(serachPosition, new Vector3(0, -1, 0)).getBlock(this.program.getMachine().getLocation().left())]; if (blockBelow != null) { diff --git a/src/main/scala/resonantinduction/electrical/armbot/task/TaskTake.java b/src/main/scala/resonantinduction/electrical/armbot/task/TaskTake.java index 90201b4cf..75296e4e2 100644 --- a/src/main/scala/resonantinduction/electrical/armbot/task/TaskTake.java +++ b/src/main/scala/resonantinduction/electrical/armbot/task/TaskTake.java @@ -7,7 +7,7 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.science.units.UnitHelper; import resonant.lib.utility.MathUtility; import resonant.lib.utility.inventory.InternalInventoryHandler; @@ -16,7 +16,7 @@ import resonantinduction.electrical.armbot.TaskBaseArmbot; import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.electrical.encoder.coding.args.ArgumentIntData; import universalelectricity.api.vector.Vector2; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; public class TaskTake extends TaskBaseArmbot { diff --git a/src/main/scala/resonantinduction/electrical/battery/RenderBattery.java b/src/main/scala/resonantinduction/electrical/battery/RenderBattery.java index 099e08e1e..9dee91c61 100644 --- a/src/main/scala/resonantinduction/electrical/battery/RenderBattery.java +++ b/src/main/scala/resonantinduction/electrical/battery/RenderBattery.java @@ -16,14 +16,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; import resonant.api.items.ISimpleItemRenderer; import resonant.lib.render.RenderUtility; import resonantinduction.core.Reference; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -90,7 +90,7 @@ public class RenderBattery extends TileEntitySpecialRenderer implements ISimpleI for (ForgeDirection check : ForgeDirection.VALID_DIRECTIONS) { - if (new Vector3(t).translate(check).getTileEntity(t.worldObj) instanceof TileBattery) + if (new Vector3(t).add(check).getTileEntity(t.worldObj) instanceof TileBattery) { disabledParts.addAll(Arrays.asList(partToDisable[check.ordinal()])); @@ -111,7 +111,7 @@ public class RenderBattery extends TileEntitySpecialRenderer implements ISimpleI { if (sideCheck.offsetY == 0) { - if (new Vector3(t).translate(sideCheck).getTileEntity(t.worldObj) instanceof TileBattery) + if (new Vector3(t).add(sideCheck).getTileEntity(t.worldObj) instanceof TileBattery) { connectionParts.removeAll(Arrays.asList(connectionPartToEnable[sideCheck.ordinal()])); // connectionParts.addAll(Arrays.asList(connectionPartSideToEnable[sideCheck.ordinal()])); diff --git a/src/main/scala/resonantinduction/electrical/battery/TileBattery.java b/src/main/scala/resonantinduction/electrical/battery/TileBattery.java index 66d1f653d..f3cc7dc2a 100644 --- a/src/main/scala/resonantinduction/electrical/battery/TileBattery.java +++ b/src/main/scala/resonantinduction/electrical/battery/TileBattery.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.packet.Packet; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.network.IPacketReceiver; import resonant.lib.network.IPacketSender; import resonantinduction.core.ResonantInduction; diff --git a/src/main/scala/resonantinduction/electrical/battery/TileEnergyDistribution.java b/src/main/scala/resonantinduction/electrical/battery/TileEnergyDistribution.java index 11e735d26..0c78ee950 100644 --- a/src/main/scala/resonantinduction/electrical/battery/TileEnergyDistribution.java +++ b/src/main/scala/resonantinduction/electrical/battery/TileEnergyDistribution.java @@ -2,10 +2,10 @@ package resonantinduction.electrical.battery; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.prefab.tile.TileElectrical; import universalelectricity.api.net.IConnector; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; public class TileEnergyDistribution extends TileElectrical implements IConnector { @@ -142,7 +142,7 @@ public class TileEnergyDistribution extends TileElectrical implements IConnector for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - TileEntity tile = new Vector3(this).translate(dir).getTileEntity(this.worldObj); + TileEntity tile = new Vector3(this).add(dir).getTileEntity(this.worldObj); if (tile != null && tile.getClass() == this.getClass()) { diff --git a/src/main/scala/resonantinduction/electrical/charger/PartCharger.java b/src/main/scala/resonantinduction/electrical/charger/PartCharger.java index e3b5287ab..d61b224b3 100644 --- a/src/main/scala/resonantinduction/electrical/charger/PartCharger.java +++ b/src/main/scala/resonantinduction/electrical/charger/PartCharger.java @@ -6,7 +6,7 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.utility.WrenchUtility; import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.prefab.part.PartInventoryPanel; @@ -58,7 +58,7 @@ public class PartCharger extends PartInventoryPanel implements IEnergyInterface if (getStackInSlot(0) != null) { - InventoryUtility.dropItemStack(world(), new universalelectricity.api.vector.Vector3(player), getStackInSlot(0), 0); + InventoryUtility.dropItemStack(world(), new universalelectricity.core.transform.vector.Vector3(player), getStackInSlot(0), 0); setInventorySlotContents(0, null); if (!world().isRemote) sendDescUpdate(); diff --git a/src/main/scala/resonantinduction/electrical/charger/RenderCharger.java b/src/main/scala/resonantinduction/electrical/charger/RenderCharger.java index f3533f22c..a58ab9bc8 100644 --- a/src/main/scala/resonantinduction/electrical/charger/RenderCharger.java +++ b/src/main/scala/resonantinduction/electrical/charger/RenderCharger.java @@ -18,7 +18,7 @@ import resonantinduction.core.Reference; import universalelectricity.api.CompatibilityModule; import universalelectricity.api.energy.UnitDisplay; import universalelectricity.api.energy.UnitDisplay.Unit; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; /** * Renderer for electric item charger diff --git a/src/main/scala/resonantinduction/electrical/distributor/TileDistributor.scala b/src/main/scala/resonantinduction/electrical/distributor/TileDistributor.scala index 44fcf9ea1..98bd9f5c2 100644 --- a/src/main/scala/resonantinduction/electrical/distributor/TileDistributor.scala +++ b/src/main/scala/resonantinduction/electrical/distributor/TileDistributor.scala @@ -7,12 +7,12 @@ import net.minecraft.block.material.Material import net.minecraft.inventory.IInventory import net.minecraft.item.ItemStack import net.minecraft.tileentity.TileEntity -import net.minecraftforge.common.ForgeDirection +import net.minecraftforge.common.util.ForgeDirection import resonant.lib.content.module.TileBase import resonant.lib.content.prefab.TraitElectrical import resonant.lib.content.prefab.TraitInventory import resonant.lib.utility.inventory.InventoryUtility -import universalelectricity.api.vector.Vector3 +import universalelectricity.core.transform.vector.Vector3 /** * A Block that interacts with connected inventories @@ -40,7 +40,7 @@ class TileDistributor extends TileBase(Material.rock) with TraitInventory with T var index: Int = 0 while (index < shuffledDirs.toArray().size) { - targetNode = prevNode.clone().translate(ForgeDirection.getOrientation(index)) + targetNode = prevNode.clone().add(ForgeDirection.getOrientation(index)) val tile: TileEntity = targetNode.getTileEntity(world()) if (tile.isInstanceOf[IInventory]) { diff --git a/src/main/scala/resonantinduction/electrical/encoder/BlockEncoder.java b/src/main/scala/resonantinduction/electrical/encoder/BlockEncoder.java index 00a186c7c..4cbdc1cca 100644 --- a/src/main/scala/resonantinduction/electrical/encoder/BlockEncoder.java +++ b/src/main/scala/resonantinduction/electrical/encoder/BlockEncoder.java @@ -1,9 +1,9 @@ package resonantinduction.electrical.encoder; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import resonant.lib.prefab.block.BlockTile; @@ -15,9 +15,9 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockEncoder extends BlockTile { - Icon encoder_side; - Icon encoder_top; - Icon encoder_bottom; + IIcon encoder_side; + IIcon encoder_top; + IIcon encoder_bottom; public BlockEncoder(int id) { @@ -26,7 +26,7 @@ public class BlockEncoder extends BlockTile @SideOnly(Side.CLIENT) @Override - public void registerIcons(IconRegister iconReg) + public void registerIcons(IIconRegister iconReg) { this.encoder_side = iconReg.registerIcon(Reference.PREFIX + "encoder_side"); this.encoder_top = iconReg.registerIcon(Reference.PREFIX + "encoder_top"); @@ -36,7 +36,7 @@ public class BlockEncoder extends BlockTile /** Returns the block texture based on the side being looked at. Args: side */ @Override @SideOnly(Side.CLIENT) - public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int side) + public IIcon getBlockTexture(IBlockAccess world, int x, int y, int z, int side) { return getIcon(side, 0); } @@ -44,7 +44,7 @@ public class BlockEncoder extends BlockTile /** Returns the block texture based on the side being looked at. Args: side */ @Override @SideOnly(Side.CLIENT) - public Icon getIcon(int side, int meta) + public IIcon getIcon(int side, int meta) { if (side == 1) { diff --git a/src/main/scala/resonantinduction/electrical/encoder/ItemDisk.java b/src/main/scala/resonantinduction/electrical/encoder/ItemDisk.java index 0a7401c7d..d67b7d1ed 100644 --- a/src/main/scala/resonantinduction/electrical/encoder/ItemDisk.java +++ b/src/main/scala/resonantinduction/electrical/encoder/ItemDisk.java @@ -3,7 +3,7 @@ package resonantinduction.electrical.encoder; import java.util.ArrayList; import java.util.List; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -23,9 +23,9 @@ public class ItemDisk extends Item @Override @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister par1IconRegister) + public void registerIcons(IIconRegister par1IIconRegister) { - this.itemIcon = par1IconRegister.registerIcon(Reference.PREFIX + "disk"); + this.itemIcon = par1IIconRegister.registerIcon(Reference.PREFIX + "disk"); } @Override diff --git a/src/main/scala/resonantinduction/electrical/encoder/coding/IProgrammableMachine.java b/src/main/scala/resonantinduction/electrical/encoder/coding/IProgrammableMachine.java index 0d13651dd..984771cbb 100644 --- a/src/main/scala/resonantinduction/electrical/encoder/coding/IProgrammableMachine.java +++ b/src/main/scala/resonantinduction/electrical/encoder/coding/IProgrammableMachine.java @@ -2,7 +2,7 @@ package resonantinduction.electrical.encoder.coding; import net.minecraft.world.World; import resonant.lib.type.Pair; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; /** * Simple interface too say an object is programmable diff --git a/src/main/scala/resonantinduction/electrical/encoder/coding/ProgramHelper.java b/src/main/scala/resonantinduction/electrical/encoder/coding/ProgramHelper.java index 6f85ea607..d94096809 100644 --- a/src/main/scala/resonantinduction/electrical/encoder/coding/ProgramHelper.java +++ b/src/main/scala/resonantinduction/electrical/encoder/coding/ProgramHelper.java @@ -5,7 +5,7 @@ import java.util.HashMap; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import resonantinduction.electrical.encoder.coding.IProcessTask.ProcessReturn; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; /** * Basic class to handle a machine like programs for any object that uses the IProgramable diff --git a/src/main/scala/resonantinduction/electrical/generator/BlockMotor.java b/src/main/scala/resonantinduction/electrical/generator/BlockMotor.java index 907bdcd51..034575e6c 100644 --- a/src/main/scala/resonantinduction/electrical/generator/BlockMotor.java +++ b/src/main/scala/resonantinduction/electrical/generator/BlockMotor.java @@ -3,7 +3,7 @@ package resonantinduction.electrical.generator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.prefab.block.BlockRotatable; import resonant.lib.render.block.BlockRenderingHandler; import resonantinduction.core.Reference; @@ -55,7 +55,7 @@ public class BlockMotor extends BlockRotatable if (!world.isRemote) { ((TileMotor) tileEntity).isInversed = !((TileMotor) tileEntity).isInversed; - entityPlayer.addChatMessage("Generator now producing " + (((TileMotor) tileEntity).isInversed ? "mechanical" : "electrical") + " energy."); + entityPlayer.addChatMessage("Generator now producing " + (((TileMotor) tileEntity).isInversed ? "resonantinduction/mechanical" : "electrical") + " energy."); } return true; diff --git a/src/main/scala/resonantinduction/electrical/generator/RenderMotor.java b/src/main/scala/resonantinduction/electrical/generator/RenderMotor.java index 0768c64fe..7cc4d23ee 100644 --- a/src/main/scala/resonantinduction/electrical/generator/RenderMotor.java +++ b/src/main/scala/resonantinduction/electrical/generator/RenderMotor.java @@ -6,7 +6,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; diff --git a/src/main/scala/resonantinduction/electrical/generator/TileMotor.java b/src/main/scala/resonantinduction/electrical/generator/TileMotor.java index b10942852..4c9d6e335 100644 --- a/src/main/scala/resonantinduction/electrical/generator/TileMotor.java +++ b/src/main/scala/resonantinduction/electrical/generator/TileMotor.java @@ -3,7 +3,7 @@ package resonantinduction.electrical.generator; import java.util.EnumSet; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.IRotatable; import resonant.api.grid.INode; import resonant.api.grid.INodeProvider; diff --git a/src/main/scala/resonantinduction/electrical/generator/solar/TileSolarPanel.java b/src/main/scala/resonantinduction/electrical/generator/solar/TileSolarPanel.java index a8ef5e3ac..482cbb275 100644 --- a/src/main/scala/resonantinduction/electrical/generator/solar/TileSolarPanel.java +++ b/src/main/scala/resonantinduction/electrical/generator/solar/TileSolarPanel.java @@ -1,8 +1,8 @@ package resonantinduction.electrical.generator.solar; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.util.Icon; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; import resonant.lib.content.module.TileRender; import resonant.lib.prefab.vector.Cuboid; import resonant.lib.utility.ConnectedTextureRenderer; @@ -16,7 +16,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class TileSolarPanel extends TileEnergyDistribution { @SideOnly(Side.CLIENT) - public static Icon sideIcon, bottomIcon; + public static IIcon sideIcon, bottomIcon; public TileSolarPanel() @@ -32,7 +32,7 @@ public class TileSolarPanel extends TileEnergyDistribution @SideOnly(Side.CLIENT) @Override - public void registerIcons(IconRegister iconReg) + public void registerIcons(IIconRegister iconReg) { sideIcon = iconReg.registerIcon(Reference.PREFIX + "solarPanel_side"); bottomIcon = iconReg.registerIcon(Reference.PREFIX + "solarPanel_bottom"); @@ -41,7 +41,7 @@ public class TileSolarPanel extends TileEnergyDistribution @Override @SideOnly(Side.CLIENT) - public Icon getIcon(int side, int meta) + public IIcon getIcon(int side, int meta) { if (side == 0) { diff --git a/src/main/scala/resonantinduction/electrical/generator/thermopile/BlockThermopile.java b/src/main/scala/resonantinduction/electrical/generator/thermopile/BlockThermopile.java index 9902fd3a6..27565a2b5 100644 --- a/src/main/scala/resonantinduction/electrical/generator/thermopile/BlockThermopile.java +++ b/src/main/scala/resonantinduction/electrical/generator/thermopile/BlockThermopile.java @@ -1,8 +1,8 @@ package resonantinduction.electrical.generator.thermopile; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.World; import resonant.lib.prefab.block.BlockTile; import resonantinduction.core.Reference; @@ -12,7 +12,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockThermopile extends BlockTile { - public Icon topIcon; + public IIcon topIcon; public BlockThermopile(int id) { @@ -21,7 +21,7 @@ public class BlockThermopile extends BlockTile @SideOnly(Side.CLIENT) @Override - public void registerIcons(IconRegister iconReg) + public void registerIcons(IIconRegister iconReg) { topIcon = iconReg.registerIcon(Reference.PREFIX + "thermopile_top"); super.registerIcons(iconReg); @@ -29,7 +29,7 @@ public class BlockThermopile extends BlockTile @Override @SideOnly(Side.CLIENT) - public Icon getIcon(int side, int meta) + public IIcon getIcon(int side, int meta) { if (side == 1) { diff --git a/src/main/scala/resonantinduction/electrical/generator/thermopile/TileThermopile.java b/src/main/scala/resonantinduction/electrical/generator/thermopile/TileThermopile.java index 8dbc3766a..472804e5a 100644 --- a/src/main/scala/resonantinduction/electrical/generator/thermopile/TileThermopile.java +++ b/src/main/scala/resonantinduction/electrical/generator/thermopile/TileThermopile.java @@ -1,10 +1,10 @@ package resonantinduction.electrical.generator.thermopile; import net.minecraft.block.Block; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.prefab.tile.TileElectrical; import universalelectricity.api.energy.EnergyStorageHandler; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; public class TileThermopile extends TileElectrical { @@ -34,9 +34,9 @@ public class TileThermopile extends TileElectrical for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - Vector3 checkPos = new Vector3(this).translate(dir); + Vector3 checkPos = new Vector3(this).add(dir); - int blockID = checkPos.getBlockID(worldObj); + int blockID = checkPos.getBlock(worldObj); if (blockID == Block.waterStill.blockID) { @@ -74,8 +74,8 @@ public class TileThermopile extends TileElectrical */ for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - Vector3 checkPos = new Vector3(this).translate(dir); - int blockID = checkPos.getBlockID(worldObj); + Vector3 checkPos = new Vector3(this).add(dir); + int blockID = checkPos.getBlock(worldObj); if (blockID == Block.waterStill.blockID) { diff --git a/src/main/scala/resonantinduction/electrical/itemrailing/ItemItemRailing.java b/src/main/scala/resonantinduction/electrical/itemrailing/ItemItemRailing.java index bbe0c7d49..484508889 100644 --- a/src/main/scala/resonantinduction/electrical/itemrailing/ItemItemRailing.java +++ b/src/main/scala/resonantinduction/electrical/itemrailing/ItemItemRailing.java @@ -3,7 +3,7 @@ package resonantinduction.electrical.itemrailing; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonantinduction.core.MultipartUtility; import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; diff --git a/src/main/scala/resonantinduction/electrical/itemrailing/NodeRailing.java b/src/main/scala/resonantinduction/electrical/itemrailing/NodeRailing.java index abcbf2fb5..810b24ea9 100644 --- a/src/main/scala/resonantinduction/electrical/itemrailing/NodeRailing.java +++ b/src/main/scala/resonantinduction/electrical/itemrailing/NodeRailing.java @@ -3,12 +3,12 @@ package resonantinduction.electrical.itemrailing; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.grid.Node; import resonant.lib.grid.TickingGrid; import resonantinduction.electrical.itemrailing.interfaces.IItemRailingProvider; import universalelectricity.api.vector.IVector3; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; /** * @since 25/05/14 @@ -49,7 +49,7 @@ public class NodeRailing extends Node for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - TileEntity tile = new Vector3(position()).translate(dir).getTileEntity(world()); + TileEntity tile = new Vector3(position()).add(dir).getTileEntity(world()); if (tile instanceof IItemRailingProvider) { diff --git a/src/main/scala/resonantinduction/electrical/itemrailing/PartRailing.java b/src/main/scala/resonantinduction/electrical/itemrailing/PartRailing.java index 5f7c79092..41fecf632 100644 --- a/src/main/scala/resonantinduction/electrical/itemrailing/PartRailing.java +++ b/src/main/scala/resonantinduction/electrical/itemrailing/PartRailing.java @@ -7,7 +7,7 @@ import codechicken.microblock.IHollowConnect; import codechicken.multipart.JNormalOcclusion; import codechicken.multipart.TSlottedPart; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.IExternalInventory; import resonant.api.IExternalInventoryBox; import resonant.api.grid.INode; diff --git a/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailing.java b/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailing.java index 0e73a368a..4f179d4a7 100644 --- a/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailing.java +++ b/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailing.java @@ -3,7 +3,7 @@ package resonantinduction.electrical.itemrailing.interfaces; import java.util.Map; import net.minecraft.inventory.IInventory; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.grid.INode; import resonant.lib.render.EnumColor; import universalelectricity.api.vector.VectorWorld; diff --git a/src/main/scala/resonantinduction/electrical/laser/gun/ItemMiningLaser.java b/src/main/scala/resonantinduction/electrical/laser/gun/ItemMiningLaser.java index e65421a45..9d8d2e858 100644 --- a/src/main/scala/resonantinduction/electrical/laser/gun/ItemMiningLaser.java +++ b/src/main/scala/resonantinduction/electrical/laser/gun/ItemMiningLaser.java @@ -14,7 +14,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.MinecraftForge; import resonant.api.event.LaserEvent; import resonant.api.event.LaserFiredPlayerEvent; @@ -23,7 +23,7 @@ import resonant.lib.type.Pair; import resonantinduction.core.ResonantInduction; import resonantinduction.core.prefab.items.ItemEnergyTool; import universalelectricity.api.vector.IVector3; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; /** Stream laser mining tool, When held down it will slowly mine away at the block in front of it. * @@ -175,8 +175,8 @@ public class ItemMiningLaser extends ItemEnergyTool { float x = (float) (MathHelper.cos((float) (player.rotationYawHead * 0.0174532925)) * (-.4) - MathHelper.sin((float) (player.rotationYawHead * 0.0174532925)) * (-.1)); float z = (float) (MathHelper.sin((float) (player.rotationYawHead * 0.0174532925)) * (-.4) + MathHelper.cos((float) (player.rotationYawHead * 0.0174532925)) * (-.1)); - ResonantInduction.proxy.renderBeam(player.worldObj, (IVector3) new Vector3(p).translate(new Vector3(x, -.25, z)), (IVector3) new Vector3(playerViewOffset), Color.red, 5); - ResonantInduction.proxy.renderBeam(player.worldObj, (IVector3) new Vector3(p).translate(new Vector3(x, -.45, z)), (IVector3) new Vector3(playerViewOffset), Color.red, 5); + ResonantInduction.proxy.renderBeam(player.worldObj, (IVector3) new Vector3(p).add(new Vector3(x, -.25, z)), (IVector3) new Vector3(playerViewOffset), Color.red, 5); + ResonantInduction.proxy.renderBeam(player.worldObj, (IVector3) new Vector3(p).add(new Vector3(x, -.45, z)), (IVector3) new Vector3(playerViewOffset), Color.red, 5); } } diff --git a/src/main/scala/resonantinduction/electrical/levitator/PartLevitator.java b/src/main/scala/resonantinduction/electrical/levitator/PartLevitator.java index 57fe91cf0..b4302ca14 100644 --- a/src/main/scala/resonantinduction/electrical/levitator/PartLevitator.java +++ b/src/main/scala/resonantinduction/electrical/levitator/PartLevitator.java @@ -19,7 +19,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidBlock; import resonant.lib.render.EnumColor; import resonant.lib.utility.LinkUtility; @@ -30,7 +30,7 @@ import resonantinduction.core.Settings; import resonantinduction.core.prefab.part.PartFace; import resonantinduction.electrical.Electrical; import resonantinduction.electrical.tesla.TileTesla; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import universalelectricity.api.vector.VectorWorld; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; @@ -70,7 +70,7 @@ public class PartLevitator extends PartFace public static boolean canBePath(World world, Vector3 position) { - Block block = Block.blocksList[position.getBlockID(world)]; + Block block = Block.blocksList[position.getBlock(world)]; return block == null || (block instanceof BlockSnow || block instanceof BlockVine || block instanceof BlockLadder || ((block instanceof BlockFluid || block instanceof IFluidBlock) && block.blockID != Block.lavaMoving.blockID && block.blockID != Block.lavaStill.blockID)); } @@ -269,8 +269,8 @@ public class PartLevitator extends PartFace */ if (renderBeam) { - Electrical.proxy.renderElectricShock(world(), getBeamSpawnPosition(), getPosition().translate(0.5), EnumColor.DYES[dyeID].toColor(), world().rand.nextFloat() > 0.9); - Electrical.proxy.renderElectricShock(world(), getLink().getPosition().translate(0.5), getLink().getBeamSpawnPosition(), EnumColor.DYES[dyeID].toColor(), world().rand.nextFloat() > 0.9); + Electrical.proxy.renderElectricShock(world(), getBeamSpawnPosition(), getPosition().add(0.5), EnumColor.DYES[dyeID].toColor(), world().rand.nextFloat() > 0.9); + Electrical.proxy.renderElectricShock(world(), getLink().getPosition().add(0.5), getLink().getBeamSpawnPosition(), EnumColor.DYES[dyeID].toColor(), world().rand.nextFloat() > 0.9); } for (int i = 0; i < results.size(); i++) @@ -288,7 +288,7 @@ public class PartLevitator extends PartFace if (renderBeam) { - Electrical.proxy.renderElectricShock(world(), prevResult.clone().translate(0.5), result.clone().translate(0.5), EnumColor.DYES[dyeID].toColor(), world().rand.nextFloat() > 0.9); + Electrical.proxy.renderElectricShock(world(), prevResult.clone().add(0.5), result.clone().add(0.5), EnumColor.DYES[dyeID].toColor(), world().rand.nextFloat() > 0.9); } AxisAlignedBB bounds = AxisAlignedBB.getAABBPool().getAABB(result.x, result.y, result.z, result.x + 1, result.y + 1, result.z + 1); @@ -485,7 +485,7 @@ public class PartLevitator extends PartFace suckBounds = operationBounds = null; ForgeDirection dir = placementSide.getOpposite(); - MovingObjectPosition mop = world().clip(getPosition().translate(dir).toVec3(), getPosition().translate(dir, Settings.LEVITATOR_MAX_REACH).toVec3()); + MovingObjectPosition mop = world().clip(getPosition().add(dir).toVec3(), getPosition().add(dir, Settings.LEVITATOR_MAX_REACH).toVec3()); int reach = Settings.LEVITATOR_MAX_REACH; diff --git a/src/main/scala/resonantinduction/electrical/levitator/PathfinderLevitator.java b/src/main/scala/resonantinduction/electrical/levitator/PathfinderLevitator.java index 74f463381..2e770bd04 100644 --- a/src/main/scala/resonantinduction/electrical/levitator/PathfinderLevitator.java +++ b/src/main/scala/resonantinduction/electrical/levitator/PathfinderLevitator.java @@ -4,11 +4,11 @@ import java.util.HashSet; import java.util.Set; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.path.IPathCallBack; import resonant.lib.path.Pathfinder; import resonant.lib.path.PathfinderAStar; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; /** * Uses the well known A* Pathfinding algorithm. @@ -32,7 +32,7 @@ public class PathfinderLevitator extends PathfinderAStar for (int i = 0; i < 6; i++) { - Vector3 neighbor = currentNode.clone().translate(ForgeDirection.getOrientation(i)); + Vector3 neighbor = currentNode.clone().add(ForgeDirection.getOrientation(i)); if (PartLevitator.canBePath(world, neighbor) || neighbor.equals(goal)) { @@ -61,7 +61,7 @@ public class PathfinderLevitator extends PathfinderAStar for (int i = 0; i < 6; i++) { ForgeDirection direction = ForgeDirection.getOrientation(i); - Vector3 neighbor = this.goal.clone().translate(new Vector3(direction.offsetX, direction.offsetY, direction.offsetZ)); + Vector3 neighbor = this.goal.clone().add(new Vector3(direction.offsetX, direction.offsetY, direction.offsetZ)); if (!PartLevitator.canBePath(this.world, neighbor)) { diff --git a/src/main/scala/resonantinduction/electrical/levitator/ThreadLevitatorPathfinding.java b/src/main/scala/resonantinduction/electrical/levitator/ThreadLevitatorPathfinding.java index fb35c0e85..2124d7dc0 100644 --- a/src/main/scala/resonantinduction/electrical/levitator/ThreadLevitatorPathfinding.java +++ b/src/main/scala/resonantinduction/electrical/levitator/ThreadLevitatorPathfinding.java @@ -3,7 +3,7 @@ */ package resonantinduction.electrical.levitator; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; /** * @author Calclavia diff --git a/src/main/scala/resonantinduction/electrical/multimeter/ItemMultimeter.java b/src/main/scala/resonantinduction/electrical/multimeter/ItemMultimeter.java index 73a59b928..464ce03e2 100644 --- a/src/main/scala/resonantinduction/electrical/multimeter/ItemMultimeter.java +++ b/src/main/scala/resonantinduction/electrical/multimeter/ItemMultimeter.java @@ -6,7 +6,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; @@ -27,7 +27,7 @@ import codechicken.multipart.TileMultipart; public class ItemMultimeter extends JItemMultiPart implements IHighlight { - private Icon[] icons = new Icon[EnumWireMaterial.values().length]; + private IIcon[] icons = new IIcon[EnumWireMaterial.values().length]; public ItemMultimeter(int id) { diff --git a/src/main/scala/resonantinduction/electrical/multimeter/MultimeterNetwork.java b/src/main/scala/resonantinduction/electrical/multimeter/MultimeterNetwork.java index 9d1e9583a..ba05984be 100644 --- a/src/main/scala/resonantinduction/electrical/multimeter/MultimeterNetwork.java +++ b/src/main/scala/resonantinduction/electrical/multimeter/MultimeterNetwork.java @@ -10,7 +10,7 @@ import resonant.lib.utility.LanguageUtility; import universalelectricity.api.energy.UnitDisplay; import universalelectricity.api.energy.UnitDisplay.Unit; import universalelectricity.api.net.IUpdate; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import universalelectricity.core.net.Network; import universalelectricity.core.net.NetworkTickHandler; @@ -211,7 +211,7 @@ public class MultimeterNetwork extends Network> 8) % 6; diff --git a/src/main/scala/resonantinduction/electrical/wire/framed/PartFramedSwitchWire.java b/src/main/scala/resonantinduction/electrical/wire/framed/PartFramedSwitchWire.java index d5945bea3..4b6deec50 100644 --- a/src/main/scala/resonantinduction/electrical/wire/framed/PartFramedSwitchWire.java +++ b/src/main/scala/resonantinduction/electrical/wire/framed/PartFramedSwitchWire.java @@ -8,7 +8,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import codechicken.lib.vec.BlockCoord; import codechicken.multipart.MultiPartRegistry; import codechicken.multipart.TileMultipart; diff --git a/src/main/scala/resonantinduction/electrical/wire/framed/PartFramedWire.java b/src/main/scala/resonantinduction/electrical/wire/framed/PartFramedWire.java index a2572694a..cdc184c00 100644 --- a/src/main/scala/resonantinduction/electrical/wire/framed/PartFramedWire.java +++ b/src/main/scala/resonantinduction/electrical/wire/framed/PartFramedWire.java @@ -16,7 +16,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.MinecraftForge; import resonant.lib.prefab.damage.ElectricalDamage; import resonantinduction.core.prefab.part.PartFramedConnection; diff --git a/src/main/scala/resonantinduction/electrical/wire/framed/RenderFramedWire.java b/src/main/scala/resonantinduction/electrical/wire/framed/RenderFramedWire.java index 7ebed86ba..ca20954f9 100644 --- a/src/main/scala/resonantinduction/electrical/wire/framed/RenderFramedWire.java +++ b/src/main/scala/resonantinduction/electrical/wire/framed/RenderFramedWire.java @@ -4,9 +4,9 @@ import java.nio.FloatBuffer; import java.util.Map; import net.minecraft.item.ItemDye; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.BufferUtils; import org.lwjgl.opengl.GL11; @@ -38,10 +38,10 @@ public class RenderFramedWire public static final ResourceLocation WIRE_SHINE = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_PATH + "white.png"); public static final Map models; public static final Map shinyModels; - public static Icon wireIcon; - public static Icon lainWireIcon; - public static Icon insulationIcon; - public static Icon breakIcon; + public static IIcon wireIcon; + public static IIcon lainWireIcon; + public static IIcon insulationIcon; + public static IIcon breakIcon; public static FloatBuffer location = BufferUtils.createFloatBuffer(4); public static FloatBuffer specular = BufferUtils.createFloatBuffer(4); public static FloatBuffer zero = BufferUtils.createFloatBuffer(4); @@ -173,7 +173,7 @@ public class RenderFramedWire renderPartShine(shinyModels.get(name)); } - public void renderPart(Icon icon, CCModel cc, double x, double y, double z, Colour colour) + public void renderPart(IIcon icon, CCModel cc, double x, double y, double z, Colour colour) { cc.render(0, cc.verts.length, Rotation.sideOrientation(0, Rotation.rotationTo(0, 2)).at(codechicken.lib.vec.Vector3.center).with(new Translation(x, y, z)), new IconTransformation(icon), new ColourMultiplier(colour)); } diff --git a/src/main/scala/resonantinduction/electrical/wire/trait/TraitConductor.java b/src/main/scala/resonantinduction/electrical/wire/trait/TraitConductor.java index 0823fea16..7b7870795 100644 --- a/src/main/scala/resonantinduction/electrical/wire/trait/TraitConductor.java +++ b/src/main/scala/resonantinduction/electrical/wire/trait/TraitConductor.java @@ -3,7 +3,7 @@ package resonantinduction.electrical.wire.trait; import java.util.HashSet; import java.util.Set; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import universalelectricity.api.energy.IConductor; import universalelectricity.api.energy.IEnergyNetwork; import universalelectricity.api.net.IConnector; diff --git a/src/main/scala/resonantinduction/electrical/wire/trait/TraitEnergyHandler.java b/src/main/scala/resonantinduction/electrical/wire/trait/TraitEnergyHandler.java index 65a29fb34..05a85af24 100644 --- a/src/main/scala/resonantinduction/electrical/wire/trait/TraitEnergyHandler.java +++ b/src/main/scala/resonantinduction/electrical/wire/trait/TraitEnergyHandler.java @@ -3,7 +3,7 @@ package resonantinduction.electrical.wire.trait; import java.util.HashSet; import java.util.Set; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonantinduction.electrical.wire.PartConductor; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; diff --git a/src/main/scala/resonantinduction/electrical/wire/trait/TraitEnergySink.java b/src/main/scala/resonantinduction/electrical/wire/trait/TraitEnergySink.java index cfbe81681..d2878e0f0 100644 --- a/src/main/scala/resonantinduction/electrical/wire/trait/TraitEnergySink.java +++ b/src/main/scala/resonantinduction/electrical/wire/trait/TraitEnergySink.java @@ -6,7 +6,7 @@ import java.util.HashSet; import java.util.Set; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import codechicken.multipart.PartMap; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; diff --git a/src/main/scala/mechanical/ClientProxy.java b/src/main/scala/resonantinduction/mechanical/ClientProxy.java similarity index 64% rename from src/main/scala/mechanical/ClientProxy.java rename to src/main/scala/resonantinduction/mechanical/ClientProxy.java index 58fb25d57..33d041034 100644 --- a/src/main/scala/mechanical/ClientProxy.java +++ b/src/main/scala/resonantinduction/mechanical/ClientProxy.java @@ -1,9 +1,9 @@ -package mechanical; +package resonantinduction.mechanical; -import mechanical.fluid.pipe.RenderPipe; +import resonantinduction.mechanical.fluid.pipe.RenderPipe; import resonant.lib.render.item.GlobalItemRenderer; -import mechanical.gear.RenderGear; -import mechanical.gearshaft.RenderGearShaft; +import resonantinduction.mechanical.gear.RenderGear; +import resonantinduction.mechanical.gearshaft.RenderGearShaft; public class ClientProxy extends CommonProxy { diff --git a/src/main/scala/mechanical/CommonProxy.java b/src/main/scala/resonantinduction/mechanical/CommonProxy.java similarity index 69% rename from src/main/scala/mechanical/CommonProxy.java rename to src/main/scala/resonantinduction/mechanical/CommonProxy.java index 0ef501546..d7e3360ef 100644 --- a/src/main/scala/mechanical/CommonProxy.java +++ b/src/main/scala/resonantinduction/mechanical/CommonProxy.java @@ -1,4 +1,4 @@ -package mechanical; +package resonantinduction.mechanical; import resonant.lib.prefab.ProxyBase; diff --git a/src/main/scala/mechanical/Mechanical.java b/src/main/scala/resonantinduction/mechanical/Mechanical.java similarity index 86% rename from src/main/scala/mechanical/Mechanical.java rename to src/main/scala/resonantinduction/mechanical/Mechanical.java index 33108efa6..e5659bcaf 100644 --- a/src/main/scala/mechanical/Mechanical.java +++ b/src/main/scala/resonantinduction/mechanical/Mechanical.java @@ -1,21 +1,21 @@ -package mechanical; +package resonantinduction.mechanical; -import mechanical.belt.BlockConveyorBelt; -import mechanical.belt.TileConveyorBelt; -import mechanical.energy.grid.MechanicalNode; -import mechanical.fluid.pipe.EnumPipeMaterial; -import mechanical.fluid.pipe.ItemPipe; -import mechanical.fluid.transport.TilePump; -import mechanical.gear.ItemGear; -import mechanical.gearshaft.ItemGearShaft; -import mechanical.logistic.belt.BlockDetector; -import mechanical.logistic.belt.BlockManipulator; -import mechanical.logistic.belt.TileDetector; -import mechanical.logistic.belt.TileManipulator; -import mechanical.process.crusher.TileMechanicalPiston; -import mechanical.process.edit.TileBreaker; -import mechanical.process.edit.TilePlacer; -import mechanical.process.grinder.TileGrindingWheel; +import resonantinduction.mechanical.belt.BlockConveyorBelt; +import resonantinduction.mechanical.belt.TileConveyorBelt; +import resonantinduction.mechanical.energy.grid.MechanicalNode; +import resonantinduction.mechanical.fluid.pipe.EnumPipeMaterial; +import resonantinduction.mechanical.fluid.pipe.ItemPipe; +import resonantinduction.mechanical.fluid.transport.TilePump; +import resonantinduction.mechanical.gear.ItemGear; +import resonantinduction.mechanical.gearshaft.ItemGearShaft; +import resonantinduction.mechanical.logistic.belt.BlockDetector; +import resonantinduction.mechanical.logistic.belt.BlockManipulator; +import resonantinduction.mechanical.logistic.belt.TileDetector; +import resonantinduction.mechanical.logistic.belt.TileManipulator; +import resonantinduction.mechanical.process.crusher.TileMechanicalPiston; +import resonantinduction.mechanical.process.edit.TileBreaker; +import resonantinduction.mechanical.process.edit.TilePlacer; +import resonantinduction.mechanical.process.grinder.TileGrindingWheel; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -34,14 +34,14 @@ import resonantinduction.core.ResonantInduction; import resonantinduction.core.Settings; import resonantinduction.core.TabRI; import resonantinduction.core.interfaces.IMechanicalNode; -import mechanical.energy.turbine.BlockWaterTurbine; -import mechanical.energy.turbine.BlockWindTurbine; -import mechanical.energy.turbine.SchematicWaterTurbine; -import mechanical.energy.turbine.SchematicWindTurbine; -import mechanical.energy.turbine.TileWaterTurbine; -import mechanical.energy.turbine.TileWindTurbine; -import mechanical.logistic.belt.TileSorter; -import mechanical.process.mixer.TileMixer; +import resonantinduction.mechanical.energy.turbine.BlockWaterTurbine; +import resonantinduction.mechanical.energy.turbine.BlockWindTurbine; +import resonantinduction.mechanical.energy.turbine.SchematicWaterTurbine; +import resonantinduction.mechanical.energy.turbine.SchematicWindTurbine; +import resonantinduction.mechanical.energy.turbine.TileWaterTurbine; +import resonantinduction.mechanical.energy.turbine.TileWindTurbine; +import resonantinduction.mechanical.logistic.belt.TileSorter; +import resonantinduction.mechanical.process.mixer.TileMixer; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; diff --git a/src/main/scala/mechanical/MicroblockHighlightHandler.java b/src/main/scala/resonantinduction/mechanical/MicroblockHighlightHandler.java similarity index 97% rename from src/main/scala/mechanical/MicroblockHighlightHandler.java rename to src/main/scala/resonantinduction/mechanical/MicroblockHighlightHandler.java index 9b1e9bcbc..cd0f8e865 100644 --- a/src/main/scala/mechanical/MicroblockHighlightHandler.java +++ b/src/main/scala/resonantinduction/mechanical/MicroblockHighlightHandler.java @@ -1,4 +1,4 @@ -package mechanical; +package resonantinduction.mechanical; import net.minecraft.util.EnumMovingObjectType; import net.minecraftforge.client.event.DrawBlockHighlightEvent; diff --git a/src/main/scala/mechanical/MultipartMechanical.java b/src/main/scala/resonantinduction/mechanical/MultipartMechanical.java similarity index 84% rename from src/main/scala/mechanical/MultipartMechanical.java rename to src/main/scala/resonantinduction/mechanical/MultipartMechanical.java index 900c99f9a..011889bdd 100644 --- a/src/main/scala/mechanical/MultipartMechanical.java +++ b/src/main/scala/resonantinduction/mechanical/MultipartMechanical.java @@ -1,8 +1,8 @@ -package mechanical; +package resonantinduction.mechanical; -import mechanical.fluid.pipe.PartPipe; -import mechanical.gear.PartGear; -import mechanical.gearshaft.PartGearShaft; +import resonantinduction.mechanical.fluid.pipe.PartPipe; +import resonantinduction.mechanical.gear.PartGear; +import resonantinduction.mechanical.gearshaft.PartGearShaft; import codechicken.multipart.MultiPartRegistry; import codechicken.multipart.MultiPartRegistry.IPartFactory; import codechicken.multipart.MultipartGenerator; diff --git a/src/main/scala/mechanical/belt/BlockConveyorBelt.java b/src/main/scala/resonantinduction/mechanical/belt/BlockConveyorBelt.java similarity index 99% rename from src/main/scala/mechanical/belt/BlockConveyorBelt.java rename to src/main/scala/resonantinduction/mechanical/belt/BlockConveyorBelt.java index ce5c4e710..cb30e5e82 100644 --- a/src/main/scala/mechanical/belt/BlockConveyorBelt.java +++ b/src/main/scala/resonantinduction/mechanical/belt/BlockConveyorBelt.java @@ -1,4 +1,4 @@ -package mechanical.belt; +package resonantinduction.mechanical.belt; import java.util.List; @@ -12,7 +12,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.prefab.block.BlockTile; import resonant.lib.render.block.BlockRenderingHandler; import resonantinduction.core.Reference; diff --git a/src/main/scala/mechanical/belt/ModelAngledBelt.java b/src/main/scala/resonantinduction/mechanical/belt/ModelAngledBelt.java similarity index 98% rename from src/main/scala/mechanical/belt/ModelAngledBelt.java rename to src/main/scala/resonantinduction/mechanical/belt/ModelAngledBelt.java index 5665cadde..bcdca0c6e 100644 --- a/src/main/scala/mechanical/belt/ModelAngledBelt.java +++ b/src/main/scala/resonantinduction/mechanical/belt/ModelAngledBelt.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package mechanical.belt; +package resonantinduction.mechanical.belt; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/scala/mechanical/belt/ModelConveyorBelt.java b/src/main/scala/resonantinduction/mechanical/belt/ModelConveyorBelt.java similarity index 99% rename from src/main/scala/mechanical/belt/ModelConveyorBelt.java rename to src/main/scala/resonantinduction/mechanical/belt/ModelConveyorBelt.java index 615b6e63b..4064dfec7 100644 --- a/src/main/scala/mechanical/belt/ModelConveyorBelt.java +++ b/src/main/scala/resonantinduction/mechanical/belt/ModelConveyorBelt.java @@ -1,4 +1,4 @@ -package mechanical.belt; +package resonantinduction.mechanical.belt; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/scala/mechanical/belt/RenderConveyorBelt.java b/src/main/scala/resonantinduction/mechanical/belt/RenderConveyorBelt.java similarity index 99% rename from src/main/scala/mechanical/belt/RenderConveyorBelt.java rename to src/main/scala/resonantinduction/mechanical/belt/RenderConveyorBelt.java index 3f04c8b44..73b606319 100644 --- a/src/main/scala/mechanical/belt/RenderConveyorBelt.java +++ b/src/main/scala/resonantinduction/mechanical/belt/RenderConveyorBelt.java @@ -1,4 +1,4 @@ -package mechanical.belt; +package resonantinduction.mechanical.belt; import java.util.HashMap; diff --git a/src/main/scala/mechanical/belt/TileConveyorBelt.java b/src/main/scala/resonantinduction/mechanical/belt/TileConveyorBelt.java similarity index 97% rename from src/main/scala/mechanical/belt/TileConveyorBelt.java rename to src/main/scala/resonantinduction/mechanical/belt/TileConveyorBelt.java index 01f443151..35895bcf1 100644 --- a/src/main/scala/mechanical/belt/TileConveyorBelt.java +++ b/src/main/scala/resonantinduction/mechanical/belt/TileConveyorBelt.java @@ -1,4 +1,4 @@ -package mechanical.belt; +package resonantinduction.mechanical.belt; import java.util.ArrayList; import java.util.Iterator; @@ -10,7 +10,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.IEntityConveyor; import resonant.api.IRotatable; import resonant.api.grid.INode; @@ -19,7 +19,7 @@ import resonant.lib.content.module.TileBase; import resonant.lib.network.IPacketReceiverWithID; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; -import mechanical.Mechanical; +import resonantinduction.mechanical.Mechanical; import com.google.common.io.ByteArrayDataInput; diff --git a/src/main/scala/mechanical/energy/grid/MechanicalNode.java b/src/main/scala/resonantinduction/mechanical/energy/grid/MechanicalNode.java similarity index 96% rename from src/main/scala/mechanical/energy/grid/MechanicalNode.java rename to src/main/scala/resonantinduction/mechanical/energy/grid/MechanicalNode.java index 14d130718..eaf393b01 100644 --- a/src/main/scala/mechanical/energy/grid/MechanicalNode.java +++ b/src/main/scala/resonantinduction/mechanical/energy/grid/MechanicalNode.java @@ -1,4 +1,4 @@ -package mechanical.energy.grid; +package resonantinduction.mechanical.energy.grid; import java.util.AbstractMap; import java.util.Iterator; @@ -8,17 +8,17 @@ import java.util.WeakHashMap; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.grid.INode; import resonant.api.grid.INodeProvider; import resonant.lib.utility.nbt.ISaveObj; import resonantinduction.core.interfaces.IMechanicalNode; import universalelectricity.api.vector.IVectorWorld; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import codechicken.multipart.TMultiPart; /** - * A mechanical node for mechanical energy. + * A resonantinduction.mechanical node for resonantinduction.mechanical energy. * * @author Calclavia, Darkguardsman */ @@ -52,7 +52,7 @@ public class MechanicalNode implements IMechanicalNode, ISaveObj, IVectorWorld public float acceleration = 2f; /** - * The current rotation of the mechanical node. + * The current rotation of the resonantinduction.mechanical node. */ public double renderAngle = 0, prev_angle = 0; /** @@ -340,7 +340,7 @@ public class MechanicalNode implements IMechanicalNode, ISaveObj, IVectorWorld for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - TileEntity tile = position().translate(dir).getTileEntity(world()); + TileEntity tile = position().add(dir).getTileEntity(world()); if (tile instanceof INodeProvider) { INode node = ((INodeProvider) tile).getNode(MechanicalNode.class, dir.getOpposite()); diff --git a/src/main/scala/mechanical/energy/grid/MechanicalNodeFrame.java b/src/main/scala/resonantinduction/mechanical/energy/grid/MechanicalNodeFrame.java similarity index 98% rename from src/main/scala/mechanical/energy/grid/MechanicalNodeFrame.java rename to src/main/scala/resonantinduction/mechanical/energy/grid/MechanicalNodeFrame.java index 213ed44f7..3211aa2a4 100644 --- a/src/main/scala/mechanical/energy/grid/MechanicalNodeFrame.java +++ b/src/main/scala/resonantinduction/mechanical/energy/grid/MechanicalNodeFrame.java @@ -1,4 +1,4 @@ -package mechanical.energy.grid; +package resonantinduction.mechanical.energy.grid; import java.awt.BorderLayout; import java.awt.Dimension; @@ -11,7 +11,7 @@ import javax.swing.JTable; import javax.swing.table.AbstractTableModel; import javax.swing.table.TableModel; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.grid.INode; import resonant.api.grid.INodeProvider; import resonantinduction.core.debug.FrameNodeDebug; diff --git a/src/main/scala/mechanical/energy/grid/PacketNetwork.java b/src/main/scala/resonantinduction/mechanical/energy/grid/PacketNetwork.java similarity index 91% rename from src/main/scala/mechanical/energy/grid/PacketNetwork.java rename to src/main/scala/resonantinduction/mechanical/energy/grid/PacketNetwork.java index ada5f02e1..0f7b20259 100644 --- a/src/main/scala/mechanical/energy/grid/PacketNetwork.java +++ b/src/main/scala/resonantinduction/mechanical/energy/grid/PacketNetwork.java @@ -1,4 +1,4 @@ -package mechanical.energy.grid; +package resonantinduction.mechanical.energy.grid; import java.util.ArrayList; import java.util.List; @@ -6,11 +6,11 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.network.IPacketReceiver; import resonant.lib.network.PacketType; import universalelectricity.api.net.IConnector; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import com.google.common.io.ByteArrayDataInput; diff --git a/src/main/scala/mechanical/energy/grid/PartMechanical.java b/src/main/scala/resonantinduction/mechanical/energy/grid/PartMechanical.java similarity index 94% rename from src/main/scala/mechanical/energy/grid/PartMechanical.java rename to src/main/scala/resonantinduction/mechanical/energy/grid/PartMechanical.java index 103065a7b..8109a3649 100644 --- a/src/main/scala/mechanical/energy/grid/PartMechanical.java +++ b/src/main/scala/resonantinduction/mechanical/energy/grid/PartMechanical.java @@ -1,4 +1,4 @@ -package mechanical.energy.grid; +package resonantinduction.mechanical.energy.grid; import java.util.ArrayList; import java.util.List; @@ -8,7 +8,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MovingObjectPosition; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.grid.INode; import resonant.api.grid.INodeProvider; import resonant.core.ResonantEngine; @@ -24,7 +24,7 @@ import codechicken.multipart.TFacePart; * @author Calclavia */ public abstract class PartMechanical extends JCuboidPart implements JNormalOcclusion, TFacePart, INodeProvider { - /** Node that handles mechanical action of the machine */ + /** Node that handles resonantinduction.mechanical action of the machine */ public MechanicalNode node; protected double prevAngularVelocity; int ticks = 0; @@ -219,9 +219,9 @@ public abstract class PartMechanical extends JCuboidPart implements JNormalOcclu return getItem(); } - public universalelectricity.api.vector.Vector3 getPosition() + public universalelectricity.core.transform.vector.Vector3 getPosition() { - return new universalelectricity.api.vector.Vector3(x(), y(), z()); + return new universalelectricity.core.transform.vector.Vector3(x(), y(), z()); } @Override diff --git a/src/main/scala/mechanical/energy/grid/TileMechanical.java b/src/main/scala/resonantinduction/mechanical/energy/grid/TileMechanical.java similarity index 94% rename from src/main/scala/mechanical/energy/grid/TileMechanical.java rename to src/main/scala/resonantinduction/mechanical/energy/grid/TileMechanical.java index 9ed4d2030..7dc0f4bf9 100644 --- a/src/main/scala/mechanical/energy/grid/TileMechanical.java +++ b/src/main/scala/resonantinduction/mechanical/energy/grid/TileMechanical.java @@ -1,4 +1,4 @@ -package mechanical.energy.grid; +package resonantinduction.mechanical.energy.grid; import java.io.IOException; @@ -8,7 +8,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.grid.INode; import resonant.api.grid.INodeProvider; import resonant.core.ResonantEngine; @@ -18,12 +18,12 @@ import resonant.lib.network.IPacketReceiver; import resonant.lib.network.IPacketReceiverWithID; import resonant.lib.network.PacketHandler; import resonantinduction.core.ResonantInduction; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import codechicken.multipart.ControlKeyModifer; import com.google.common.io.ByteArrayDataInput; -/** Prefab for mechanical tiles +/** Prefab for resonantinduction.mechanical tiles * * @author Calclavia */ public abstract class TileMechanical extends TileBase implements INodeProvider, IPacketReceiverWithID @@ -31,7 +31,7 @@ public abstract class TileMechanical extends TileBase implements INodeProvider, protected static final int PACKET_NBT = 0; protected static final int PACKET_VELOCITY = 1; - /** Node that handles most mechanical actions */ + /** Node that handles most resonantinduction.mechanical actions */ public MechanicalNode mechanicalNode; /** External debug GUI */ diff --git a/src/main/scala/mechanical/energy/turbine/BlockTurbine.java b/src/main/scala/resonantinduction/mechanical/energy/turbine/BlockTurbine.java similarity index 98% rename from src/main/scala/mechanical/energy/turbine/BlockTurbine.java rename to src/main/scala/resonantinduction/mechanical/energy/turbine/BlockTurbine.java index 4ec1bc68f..716ffb8f1 100644 --- a/src/main/scala/mechanical/energy/turbine/BlockTurbine.java +++ b/src/main/scala/resonantinduction/mechanical/energy/turbine/BlockTurbine.java @@ -1,4 +1,4 @@ -package mechanical.energy.turbine; +package resonantinduction.mechanical.energy.turbine; import java.util.HashSet; import java.util.Set; diff --git a/src/main/scala/mechanical/energy/turbine/BlockWaterTurbine.java b/src/main/scala/resonantinduction/mechanical/energy/turbine/BlockWaterTurbine.java similarity index 93% rename from src/main/scala/mechanical/energy/turbine/BlockWaterTurbine.java rename to src/main/scala/resonantinduction/mechanical/energy/turbine/BlockWaterTurbine.java index b6cee0719..af5d6dc65 100644 --- a/src/main/scala/mechanical/energy/turbine/BlockWaterTurbine.java +++ b/src/main/scala/resonantinduction/mechanical/energy/turbine/BlockWaterTurbine.java @@ -1,4 +1,4 @@ -package mechanical.energy.turbine; +package resonantinduction.mechanical.energy.turbine; import java.util.List; diff --git a/src/main/scala/mechanical/energy/turbine/BlockWindTurbine.java b/src/main/scala/resonantinduction/mechanical/energy/turbine/BlockWindTurbine.java similarity index 93% rename from src/main/scala/mechanical/energy/turbine/BlockWindTurbine.java rename to src/main/scala/resonantinduction/mechanical/energy/turbine/BlockWindTurbine.java index deb5b8eb8..024712b91 100644 --- a/src/main/scala/mechanical/energy/turbine/BlockWindTurbine.java +++ b/src/main/scala/resonantinduction/mechanical/energy/turbine/BlockWindTurbine.java @@ -1,4 +1,4 @@ -package mechanical.energy.turbine; +package resonantinduction.mechanical.energy.turbine; import java.util.List; diff --git a/src/main/scala/mechanical/energy/turbine/RenderWaterTurbine.java b/src/main/scala/resonantinduction/mechanical/energy/turbine/RenderWaterTurbine.java similarity index 96% rename from src/main/scala/mechanical/energy/turbine/RenderWaterTurbine.java rename to src/main/scala/resonantinduction/mechanical/energy/turbine/RenderWaterTurbine.java index a0e189ff3..15c97210a 100644 --- a/src/main/scala/mechanical/energy/turbine/RenderWaterTurbine.java +++ b/src/main/scala/resonantinduction/mechanical/energy/turbine/RenderWaterTurbine.java @@ -1,4 +1,4 @@ -package mechanical.energy.turbine; +package resonantinduction.mechanical.energy.turbine; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; @@ -33,7 +33,7 @@ public class RenderWaterTurbine extends TileEntitySpecialRenderer implements ISi // Determine if the turbine is facing horizontally or vertical. RenderUtility.rotateBlockBasedOnDirectionUp(tile.getDirection()); - // Get the rotation directly from the mechanical node running client side. + // Get the rotation directly from the resonantinduction.mechanical node running client side. double mechanicalNodeRenderAngle = tile.mechanicalNode.renderAngle; // We need to convert this value into something the model renderer can understand. diff --git a/src/main/scala/mechanical/energy/turbine/RenderWindTurbine.java b/src/main/scala/resonantinduction/mechanical/energy/turbine/RenderWindTurbine.java similarity index 98% rename from src/main/scala/mechanical/energy/turbine/RenderWindTurbine.java rename to src/main/scala/resonantinduction/mechanical/energy/turbine/RenderWindTurbine.java index 352f0844f..828f066bd 100644 --- a/src/main/scala/mechanical/energy/turbine/RenderWindTurbine.java +++ b/src/main/scala/resonantinduction/mechanical/energy/turbine/RenderWindTurbine.java @@ -1,4 +1,4 @@ -package mechanical.energy.turbine; +package resonantinduction.mechanical.energy.turbine; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; diff --git a/src/main/scala/mechanical/energy/turbine/SchematicWaterTurbine.java b/src/main/scala/resonantinduction/mechanical/energy/turbine/SchematicWaterTurbine.java similarity index 80% rename from src/main/scala/mechanical/energy/turbine/SchematicWaterTurbine.java rename to src/main/scala/resonantinduction/mechanical/energy/turbine/SchematicWaterTurbine.java index db44535eb..2e8cff514 100644 --- a/src/main/scala/mechanical/energy/turbine/SchematicWaterTurbine.java +++ b/src/main/scala/resonantinduction/mechanical/energy/turbine/SchematicWaterTurbine.java @@ -1,12 +1,12 @@ -package mechanical.energy.turbine; +package resonantinduction.mechanical.energy.turbine; import java.util.HashMap; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.schematic.Schematic; import resonant.lib.type.Pair; -import mechanical.Mechanical; -import universalelectricity.api.vector.Vector3; +import resonantinduction.mechanical.Mechanical; +import universalelectricity.core.transform.vector.Vector3; public class SchematicWaterTurbine extends Schematic { diff --git a/src/main/scala/mechanical/energy/turbine/SchematicWindTurbine.java b/src/main/scala/resonantinduction/mechanical/energy/turbine/SchematicWindTurbine.java similarity index 80% rename from src/main/scala/mechanical/energy/turbine/SchematicWindTurbine.java rename to src/main/scala/resonantinduction/mechanical/energy/turbine/SchematicWindTurbine.java index d8a665186..ef3a9e673 100644 --- a/src/main/scala/mechanical/energy/turbine/SchematicWindTurbine.java +++ b/src/main/scala/resonantinduction/mechanical/energy/turbine/SchematicWindTurbine.java @@ -1,12 +1,12 @@ -package mechanical.energy.turbine; +package resonantinduction.mechanical.energy.turbine; import java.util.HashMap; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.schematic.Schematic; import resonant.lib.type.Pair; -import mechanical.Mechanical; -import universalelectricity.api.vector.Vector3; +import resonantinduction.mechanical.Mechanical; +import universalelectricity.core.transform.vector.Vector3; public class SchematicWindTurbine extends Schematic { diff --git a/src/main/scala/mechanical/energy/turbine/TileTurbine.java b/src/main/scala/resonantinduction/mechanical/energy/turbine/TileTurbine.java similarity index 95% rename from src/main/scala/mechanical/energy/turbine/TileTurbine.java rename to src/main/scala/resonantinduction/mechanical/energy/turbine/TileTurbine.java index 5f9d0712a..874184b92 100644 --- a/src/main/scala/mechanical/energy/turbine/TileTurbine.java +++ b/src/main/scala/resonantinduction/mechanical/energy/turbine/TileTurbine.java @@ -1,18 +1,18 @@ -package mechanical.energy.turbine; +package resonantinduction.mechanical.energy.turbine; import java.util.HashSet; import java.util.Set; -import mechanical.energy.grid.TileMechanical; +import resonantinduction.mechanical.energy.grid.TileMechanical; import net.minecraft.block.material.Material; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.grid.INodeProvider; import resonant.lib.multiblock.IMultiBlockStructure; import resonant.lib.network.IPacketReceiverWithID; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/scala/mechanical/energy/turbine/TileWaterTurbine.java b/src/main/scala/resonantinduction/mechanical/energy/turbine/TileWaterTurbine.java similarity index 91% rename from src/main/scala/mechanical/energy/turbine/TileWaterTurbine.java rename to src/main/scala/resonantinduction/mechanical/energy/turbine/TileWaterTurbine.java index 0a8a9cea6..93551e32d 100644 --- a/src/main/scala/mechanical/energy/turbine/TileWaterTurbine.java +++ b/src/main/scala/resonantinduction/mechanical/energy/turbine/TileWaterTurbine.java @@ -1,4 +1,4 @@ -package mechanical.energy.turbine; +package resonantinduction.mechanical.energy.turbine; import java.lang.reflect.Method; @@ -7,11 +7,11 @@ import net.minecraft.block.BlockFluid; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.grid.INodeProvider; import resonantinduction.core.Settings; -import mechanical.energy.grid.MechanicalNode; -import universalelectricity.api.vector.Vector3; +import resonantinduction.mechanical.energy.grid.MechanicalNode; +import universalelectricity.core.transform.vector.Vector3; import cpw.mods.fml.relauncher.ReflectionHelper; /** @@ -38,7 +38,7 @@ public class TileWaterTurbine extends TileTurbine /** * Face to face stick connection. */ - TileEntity sourceTile = position().translate(from).getTileEntity(getWorld()); + TileEntity sourceTile = position().add(from).getTileEntity(getWorld()); if (sourceTile instanceof INodeProvider) { @@ -100,7 +100,7 @@ public class TileWaterTurbine extends TileTurbine { if (dir != currentDir && dir != currentDir.getOpposite()) { - Vector3 check = new Vector3(this).translate(dir); + Vector3 check = new Vector3(this).add(dir); int blockID = worldObj.getBlockId(check.intX(), check.intY(), check.intZ()); int metadata = worldObj.getBlockMetadata(check.intX(), check.intY(), check.intZ()); diff --git a/src/main/scala/mechanical/energy/turbine/TileWindTurbine.java b/src/main/scala/resonantinduction/mechanical/energy/turbine/TileWindTurbine.java similarity index 95% rename from src/main/scala/mechanical/energy/turbine/TileWindTurbine.java rename to src/main/scala/resonantinduction/mechanical/energy/turbine/TileWindTurbine.java index 60880543a..33927af4d 100644 --- a/src/main/scala/mechanical/energy/turbine/TileWindTurbine.java +++ b/src/main/scala/resonantinduction/mechanical/energy/turbine/TileWindTurbine.java @@ -1,4 +1,4 @@ -package mechanical.energy.turbine; +package resonantinduction.mechanical.energy.turbine; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -6,10 +6,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenOcean; import net.minecraft.world.biome.BiomeGenPlains; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.Settings; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; /** The vertical wind turbine collects airflow. The horizontal wind turbine collects steam from steam * power plants. @@ -94,7 +94,7 @@ public class TileWindTurbine extends TileTurbine while (openAirBlocks < checkSize && worldObj.isAirBlock(check.intX(), check.intY(), check.intZ())) { - check.translate(checkDir); + check.add(checkDir); openAirBlocks++; } diff --git a/src/main/scala/mechanical/energy/turbine/TurbineMBlockHandler.java b/src/main/scala/resonantinduction/mechanical/energy/turbine/TurbineMBlockHandler.java similarity index 86% rename from src/main/scala/mechanical/energy/turbine/TurbineMBlockHandler.java rename to src/main/scala/resonantinduction/mechanical/energy/turbine/TurbineMBlockHandler.java index 69012007e..b1612d19c 100644 --- a/src/main/scala/mechanical/energy/turbine/TurbineMBlockHandler.java +++ b/src/main/scala/resonantinduction/mechanical/energy/turbine/TurbineMBlockHandler.java @@ -1,8 +1,8 @@ -package mechanical.energy.turbine; +package resonantinduction.mechanical.energy.turbine; import net.minecraft.tileentity.TileEntity; import resonant.lib.multiblock.MultiBlockHandler; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; public class TurbineMBlockHandler extends MultiBlockHandler { diff --git a/src/main/scala/mechanical/energy/turbine/TurbineNode.java b/src/main/scala/resonantinduction/mechanical/energy/turbine/TurbineNode.java similarity index 85% rename from src/main/scala/mechanical/energy/turbine/TurbineNode.java rename to src/main/scala/resonantinduction/mechanical/energy/turbine/TurbineNode.java index 30cfeb082..a72323850 100644 --- a/src/main/scala/mechanical/energy/turbine/TurbineNode.java +++ b/src/main/scala/resonantinduction/mechanical/energy/turbine/TurbineNode.java @@ -1,7 +1,7 @@ -package mechanical.energy.turbine; +package resonantinduction.mechanical.energy.turbine; -import mechanical.energy.grid.MechanicalNode; -import net.minecraftforge.common.ForgeDirection; +import resonantinduction.mechanical.energy.grid.MechanicalNode; +import net.minecraftforge.common.util.ForgeDirection; import resonantinduction.core.interfaces.IMechanicalNode; /** diff --git a/src/main/scala/mechanical/fluid/pipe/EnumPipeMaterial.java b/src/main/scala/resonantinduction/mechanical/fluid/pipe/EnumPipeMaterial.java similarity index 93% rename from src/main/scala/mechanical/fluid/pipe/EnumPipeMaterial.java rename to src/main/scala/resonantinduction/mechanical/fluid/pipe/EnumPipeMaterial.java index ea0258def..24c8448a2 100644 --- a/src/main/scala/mechanical/fluid/pipe/EnumPipeMaterial.java +++ b/src/main/scala/resonantinduction/mechanical/fluid/pipe/EnumPipeMaterial.java @@ -1,4 +1,4 @@ -package mechanical.fluid.pipe; +package resonantinduction.mechanical.fluid.pipe; import java.awt.Color; diff --git a/src/main/scala/mechanical/fluid/pipe/ItemPipe.java b/src/main/scala/resonantinduction/mechanical/fluid/pipe/ItemPipe.java similarity index 97% rename from src/main/scala/mechanical/fluid/pipe/ItemPipe.java rename to src/main/scala/resonantinduction/mechanical/fluid/pipe/ItemPipe.java index 4b9631834..38587494f 100644 --- a/src/main/scala/mechanical/fluid/pipe/ItemPipe.java +++ b/src/main/scala/resonantinduction/mechanical/fluid/pipe/ItemPipe.java @@ -1,4 +1,4 @@ -package mechanical.fluid.pipe; +package resonantinduction.mechanical.fluid.pipe; import java.util.List; diff --git a/src/main/scala/mechanical/fluid/pipe/PartPipe.java b/src/main/scala/resonantinduction/mechanical/fluid/pipe/PartPipe.java similarity index 98% rename from src/main/scala/mechanical/fluid/pipe/PartPipe.java rename to src/main/scala/resonantinduction/mechanical/fluid/pipe/PartPipe.java index 1458d2163..095c41ed4 100644 --- a/src/main/scala/mechanical/fluid/pipe/PartPipe.java +++ b/src/main/scala/resonantinduction/mechanical/fluid/pipe/PartPipe.java @@ -1,4 +1,4 @@ -package mechanical.fluid.pipe; +package resonantinduction.mechanical.fluid.pipe; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.entity.player.EntityPlayer; @@ -6,7 +6,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MovingObjectPosition; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; @@ -19,7 +19,7 @@ import resonantinduction.core.ResonantInduction; import resonantinduction.core.grid.fluid.FluidPressureNode; import resonantinduction.core.grid.fluid.IPressureNodeProvider; import resonantinduction.core.prefab.part.PartFramedNode; -import mechanical.Mechanical; +import resonantinduction.mechanical.Mechanical; import codechicken.lib.data.MCDataInput; import codechicken.lib.render.CCRenderState; import codechicken.lib.render.IconTransformation; diff --git a/src/main/scala/mechanical/fluid/pipe/PipeNodeFrame.java b/src/main/scala/resonantinduction/mechanical/fluid/pipe/PipeNodeFrame.java similarity index 97% rename from src/main/scala/mechanical/fluid/pipe/PipeNodeFrame.java rename to src/main/scala/resonantinduction/mechanical/fluid/pipe/PipeNodeFrame.java index b3a995442..5bea110e3 100644 --- a/src/main/scala/mechanical/fluid/pipe/PipeNodeFrame.java +++ b/src/main/scala/resonantinduction/mechanical/fluid/pipe/PipeNodeFrame.java @@ -1,4 +1,4 @@ -package mechanical.fluid.pipe; +package resonantinduction.mechanical.fluid.pipe; import java.awt.BorderLayout; import java.awt.Dimension; @@ -9,7 +9,7 @@ import javax.swing.JTable; import javax.swing.table.AbstractTableModel; import javax.swing.table.TableModel; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.grid.INode; import resonant.api.grid.INodeProvider; import resonantinduction.core.debug.FrameNodeDebug; diff --git a/src/main/scala/mechanical/fluid/pipe/PipePressureNode.java b/src/main/scala/resonantinduction/mechanical/fluid/pipe/PipePressureNode.java similarity index 95% rename from src/main/scala/mechanical/fluid/pipe/PipePressureNode.java rename to src/main/scala/resonantinduction/mechanical/fluid/pipe/PipePressureNode.java index 7e7d70e08..1233dd7ae 100644 --- a/src/main/scala/mechanical/fluid/pipe/PipePressureNode.java +++ b/src/main/scala/resonantinduction/mechanical/fluid/pipe/PipePressureNode.java @@ -1,7 +1,7 @@ -package mechanical.fluid.pipe; +package resonantinduction.mechanical.fluid.pipe; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; import resonant.api.grid.INode; import resonant.api.grid.INodeProvider; @@ -36,7 +36,7 @@ public class PipePressureNode extends FluidPressureNode for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - TileEntity tile = position().translate(dir).getTileEntity(world()); + TileEntity tile = position().add(dir).getTileEntity(world()); if (tile instanceof IFluidHandler) { diff --git a/src/main/scala/mechanical/fluid/pipe/RenderPipe.java b/src/main/scala/resonantinduction/mechanical/fluid/pipe/RenderPipe.java similarity index 98% rename from src/main/scala/mechanical/fluid/pipe/RenderPipe.java rename to src/main/scala/resonantinduction/mechanical/fluid/pipe/RenderPipe.java index f583920b5..60919bdf7 100644 --- a/src/main/scala/mechanical/fluid/pipe/RenderPipe.java +++ b/src/main/scala/resonantinduction/mechanical/fluid/pipe/RenderPipe.java @@ -1,4 +1,4 @@ -package mechanical.fluid.pipe; +package resonantinduction.mechanical.fluid.pipe; import java.awt.Color; @@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; diff --git a/src/main/scala/mechanical/fluid/transport/RenderPump.java b/src/main/scala/resonantinduction/mechanical/fluid/transport/RenderPump.java similarity index 96% rename from src/main/scala/mechanical/fluid/transport/RenderPump.java rename to src/main/scala/resonantinduction/mechanical/fluid/transport/RenderPump.java index 5b75ea670..cba81e849 100644 --- a/src/main/scala/mechanical/fluid/transport/RenderPump.java +++ b/src/main/scala/resonantinduction/mechanical/fluid/transport/RenderPump.java @@ -1,4 +1,4 @@ -package mechanical.fluid.transport; +package resonantinduction.mechanical.fluid.transport; import java.util.ArrayList; import java.util.List; diff --git a/src/main/scala/mechanical/fluid/transport/TilePump.java b/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.java similarity index 89% rename from src/main/scala/mechanical/fluid/transport/TilePump.java rename to src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.java index a593edeb8..15a845caa 100644 --- a/src/main/scala/mechanical/fluid/transport/TilePump.java +++ b/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.java @@ -1,8 +1,8 @@ -package mechanical.fluid.transport; +package resonantinduction.mechanical.fluid.transport; -import mechanical.energy.grid.TileMechanical; +import resonantinduction.mechanical.energy.grid.TileMechanical; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; @@ -13,7 +13,7 @@ import resonant.api.grid.INode; import resonantinduction.core.grid.fluid.FluidPressureNode; import resonantinduction.core.grid.fluid.IPressureNodeProvider; import universalelectricity.api.UniversalElectricity; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; public class TilePump extends TileMechanical implements IPressureNodeProvider, IRotatable { @@ -88,7 +88,7 @@ public class TilePump extends TileMechanical implements IPressureNodeProvider, I /** * Try to suck fluid in */ - TileEntity tileIn = new Vector3(this).translate(getDirection().getOpposite()).getTileEntity(this.worldObj); + TileEntity tileIn = new Vector3(this).add(getDirection().getOpposite()).getTileEntity(this.worldObj); if (tileIn instanceof IFluidHandler) { @@ -107,7 +107,7 @@ public class TilePump extends TileMechanical implements IPressureNodeProvider, I { if (from == getDirection().getOpposite()) { - TileEntity tileOut = new Vector3(this).translate(from.getOpposite()).getTileEntity(this.worldObj); + TileEntity tileOut = new Vector3(this).add(from.getOpposite()).getTileEntity(this.worldObj); if (tileOut instanceof IFluidHandler) return ((IFluidHandler) tileOut).fill(from, resource, doFill); diff --git a/src/main/scala/mechanical/gear/GearMultiBlockHandler.java b/src/main/scala/resonantinduction/mechanical/gear/GearMultiBlockHandler.java similarity index 83% rename from src/main/scala/mechanical/gear/GearMultiBlockHandler.java rename to src/main/scala/resonantinduction/mechanical/gear/GearMultiBlockHandler.java index 5d299e4c3..71372180d 100644 --- a/src/main/scala/mechanical/gear/GearMultiBlockHandler.java +++ b/src/main/scala/resonantinduction/mechanical/gear/GearMultiBlockHandler.java @@ -1,9 +1,9 @@ -package mechanical.gear; +package resonantinduction.mechanical.gear; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.multiblock.MultiBlockHandler; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; diff --git a/src/main/scala/mechanical/gear/GearNode.java b/src/main/scala/resonantinduction/mechanical/gear/GearNode.java similarity index 89% rename from src/main/scala/mechanical/gear/GearNode.java rename to src/main/scala/resonantinduction/mechanical/gear/GearNode.java index a336a622e..aef6d5201 100644 --- a/src/main/scala/mechanical/gear/GearNode.java +++ b/src/main/scala/resonantinduction/mechanical/gear/GearNode.java @@ -1,11 +1,11 @@ -package mechanical.gear; +package resonantinduction.mechanical.gear; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.grid.INodeProvider; import resonantinduction.core.interfaces.IMechanicalNode; -import mechanical.energy.grid.MechanicalNode; -import mechanical.gearshaft.PartGearShaft; +import resonantinduction.mechanical.energy.grid.MechanicalNode; +import resonantinduction.mechanical.gearshaft.PartGearShaft; import codechicken.lib.vec.Rotation; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; @@ -94,7 +94,7 @@ public class GearNode extends MechanicalNode } /** Look for gears that are back-to-back with this gear. Equate torque. */ - TileEntity tileBehind = new universalelectricity.api.vector.Vector3(gear().tile()).translate(gear().placementSide).getTileEntity(world()); + TileEntity tileBehind = new universalelectricity.core.transform.vector.Vector3(gear().tile()).add(gear().placementSide).getTileEntity(world()); if (tileBehind instanceof INodeProvider) { @@ -116,7 +116,7 @@ public class GearNode extends MechanicalNode if (gear().getMultiBlock().isConstructed() && checkDir != gear().placementSide && checkDir != gear().placementSide.getOpposite()) { - tile = new universalelectricity.api.vector.Vector3(gear().tile()).translate(checkDir).getTileEntity(world()); + tile = new universalelectricity.core.transform.vector.Vector3(gear().tile()).add(checkDir).getTileEntity(world()); } if (tile instanceof INodeProvider) @@ -143,7 +143,7 @@ public class GearNode extends MechanicalNode for (int i = 0; i < 4; i++) { ForgeDirection checkDir = ForgeDirection.getOrientation(Rotation.rotateSide(gear().placementSide.ordinal(), i)); - TileEntity checkTile = new universalelectricity.api.vector.Vector3(gear().tile()).translate(checkDir, displaceCheck).getTileEntity(world()); + TileEntity checkTile = new universalelectricity.core.transform.vector.Vector3(gear().tile()).add(checkDir, displaceCheck).getTileEntity(world()); if (!getConnections().containsValue(checkDir) && checkTile instanceof INodeProvider) { @@ -230,7 +230,7 @@ public class GearNode extends MechanicalNode } /** Face to face stick connection. */ - TileEntity sourceTile = position().translate(from.getOpposite()).getTileEntity(world()); + TileEntity sourceTile = position().add(from.getOpposite()).getTileEntity(world()); if (sourceTile instanceof INodeProvider) { @@ -241,7 +241,7 @@ public class GearNode extends MechanicalNode else if (from == gear().placementSide) { /** Face to face stick connection. */ - TileEntity sourceTile = position().translate(from).getTileEntity(world()); + TileEntity sourceTile = position().add(from).getTileEntity(world()); if (sourceTile instanceof INodeProvider) { @@ -251,7 +251,7 @@ public class GearNode extends MechanicalNode } else { - TileEntity destinationTile = ((MechanicalNode) with).position().translate(from.getOpposite()).getTileEntity(world()); + TileEntity destinationTile = ((MechanicalNode) with).position().add(from.getOpposite()).getTileEntity(world()); if (destinationTile instanceof INodeProvider && destinationTile instanceof TileMultipart) { @@ -282,7 +282,7 @@ public class GearNode extends MechanicalNode @Override public float getRatio(ForgeDirection dir, IMechanicalNode with) { - universalelectricity.api.vector.Vector3 deltaPos = with.position().subtract(position()); + universalelectricity.core.transform.vector.Vector3 deltaPos = with.position().subtract(position()); boolean caseX = gear().placementSide.offsetX != 0 && deltaPos.y == 0 && deltaPos.z == 0; boolean caseY = gear().placementSide.offsetY != 0 && deltaPos.x == 0 && deltaPos.z == 0; diff --git a/src/main/scala/mechanical/gear/ItemGear.java b/src/main/scala/resonantinduction/mechanical/gear/ItemGear.java similarity index 95% rename from src/main/scala/mechanical/gear/ItemGear.java rename to src/main/scala/resonantinduction/mechanical/gear/ItemGear.java index 4ae5db036..39a253e67 100644 --- a/src/main/scala/mechanical/gear/ItemGear.java +++ b/src/main/scala/resonantinduction/mechanical/gear/ItemGear.java @@ -1,4 +1,4 @@ -package mechanical.gear; +package resonantinduction.mechanical.gear; import java.util.List; @@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import resonantinduction.core.prefab.part.IHighlight; -import mechanical.gearshaft.PartGearShaft; +import resonantinduction.mechanical.gearshaft.PartGearShaft; import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; import codechicken.microblock.FacePlacementGrid$; diff --git a/src/main/scala/mechanical/gear/PartGear.java b/src/main/scala/resonantinduction/mechanical/gear/PartGear.java similarity index 86% rename from src/main/scala/mechanical/gear/PartGear.java rename to src/main/scala/resonantinduction/mechanical/gear/PartGear.java index 2373c5705..681f52095 100644 --- a/src/main/scala/mechanical/gear/PartGear.java +++ b/src/main/scala/resonantinduction/mechanical/gear/PartGear.java @@ -1,4 +1,4 @@ -package mechanical.gear; +package resonantinduction.mechanical.gear; import java.util.Arrays; import java.util.HashSet; @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.grid.INode; import resonant.api.grid.INodeProvider; import resonant.lib.multiblock.IMultiBlockStructure; @@ -17,8 +17,8 @@ import resonant.lib.multiblock.MultiBlockHandler; import resonant.lib.utility.WrenchUtility; import resonantinduction.core.Reference; import resonantinduction.core.resource.ItemHandCrank; -import mechanical.Mechanical; -import mechanical.energy.grid.PartMechanical; +import resonantinduction.mechanical.Mechanical; +import resonantinduction.mechanical.energy.grid.PartMechanical; import codechicken.lib.vec.Cuboid6; import codechicken.lib.vec.Rotation; import codechicken.lib.vec.Transformation; @@ -127,7 +127,7 @@ public class PartGear extends PartMechanical implements IMultiBlockStructure vectors = new HashSet(); + Set vectors = new HashSet(); ForgeDirection dir = placementSide; - universalelectricity.api.vector.Vector3 rotationalAxis = universalelectricity.api.vector.Vector3.UP(); + universalelectricity.core.transform.vector.Vector3 rotationalAxis = universalelectricity.core.transform.vector.Vector3.UP(); if (placementSide == ForgeDirection.NORTH || placementSide == ForgeDirection.SOUTH) { - rotationalAxis = universalelectricity.api.vector.Vector3.EAST(); + rotationalAxis = universalelectricity.core.transform.vector.Vector3.EAST(); } else if (placementSide == ForgeDirection.WEST || placementSide == ForgeDirection.EAST) { - rotationalAxis = universalelectricity.api.vector.Vector3.SOUTH(); + rotationalAxis = universalelectricity.core.transform.vector.Vector3.SOUTH(); } for (int x = -1; x <= 1; x++) { for (int z = -1; z <= 1; z++) { - universalelectricity.api.vector.Vector3 vector = new universalelectricity.api.vector.Vector3(x, 0, z); + universalelectricity.core.transform.vector.Vector3 vector = new universalelectricity.core.transform.vector.Vector3(x, 0, z); vector.rotate(90, rotationalAxis); vector = vector.round(); vectors.add(vector); } } - return vectors.toArray(new universalelectricity.api.vector.Vector3[0]); + return vectors.toArray(new universalelectricity.core.transform.vector.Vector3[0]); } @Override diff --git a/src/main/scala/mechanical/gear/RenderGear.java b/src/main/scala/resonantinduction/mechanical/gear/RenderGear.java similarity index 95% rename from src/main/scala/mechanical/gear/RenderGear.java rename to src/main/scala/resonantinduction/mechanical/gear/RenderGear.java index 9561a3a83..4662cde5d 100644 --- a/src/main/scala/mechanical/gear/RenderGear.java +++ b/src/main/scala/resonantinduction/mechanical/gear/RenderGear.java @@ -1,9 +1,9 @@ -package mechanical.gear; +package resonantinduction.mechanical.gear; import net.minecraft.item.ItemStack; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; diff --git a/src/main/scala/mechanical/gear/dev/GearNetwork.java b/src/main/scala/resonantinduction/mechanical/gear/dev/GearNetwork.java similarity index 95% rename from src/main/scala/mechanical/gear/dev/GearNetwork.java rename to src/main/scala/resonantinduction/mechanical/gear/dev/GearNetwork.java index 131b78988..2aa2852e5 100644 --- a/src/main/scala/mechanical/gear/dev/GearNetwork.java +++ b/src/main/scala/resonantinduction/mechanical/gear/dev/GearNetwork.java @@ -1,4 +1,4 @@ -package mechanical.gear.dev; +package resonantinduction.mechanical.gear.dev; import java.util.Collections; import java.util.LinkedHashSet; @@ -6,12 +6,12 @@ import java.util.Map.Entry; import java.util.Set; import java.util.WeakHashMap; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import universalelectricity.api.net.IUpdate; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import universalelectricity.core.net.ConnectionPathfinder; -/** Network type only used by gear related mechanical machines. Any node that uses this network needs +/** Network type only used by gear related resonantinduction.mechanical machines. Any node that uses this network needs * to call onAdded() and onRemoved(). This way the network knows when to handle remapping of all * connections. * diff --git a/src/main/scala/mechanical/gear/dev/GearPathFinder.java b/src/main/scala/resonantinduction/mechanical/gear/dev/GearPathFinder.java similarity index 95% rename from src/main/scala/mechanical/gear/dev/GearPathFinder.java rename to src/main/scala/resonantinduction/mechanical/gear/dev/GearPathFinder.java index b0d0bee24..3830dd39b 100644 --- a/src/main/scala/mechanical/gear/dev/GearPathFinder.java +++ b/src/main/scala/resonantinduction/mechanical/gear/dev/GearPathFinder.java @@ -1,4 +1,4 @@ -package mechanical.gear.dev; +package resonantinduction.mechanical.gear.dev; import java.util.ArrayList; import java.util.Arrays; @@ -9,8 +9,8 @@ import java.util.Set; import codechicken.multipart.TileMultipart; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; -import universalelectricity.api.vector.Vector3; +import net.minecraftforge.common.util.ForgeDirection; +import universalelectricity.core.transform.vector.Vector3; import universalelectricity.api.vector.VectorWorld; /** @author robert */ @@ -90,7 +90,7 @@ public class GearPathFinder { for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) { - VectorWorld pos = (VectorWorld) currentNode.clone().translate(direction); + VectorWorld pos = (VectorWorld) currentNode.clone().add(direction); TileEntity tile = pos.getTileEntity(); if (isValid(pos) && isValid(tile)) diff --git a/src/main/scala/mechanical/gear/dev/NodeGear.java b/src/main/scala/resonantinduction/mechanical/gear/dev/NodeGear.java similarity index 95% rename from src/main/scala/mechanical/gear/dev/NodeGear.java rename to src/main/scala/resonantinduction/mechanical/gear/dev/NodeGear.java index 08de34d83..205583333 100644 --- a/src/main/scala/mechanical/gear/dev/NodeGear.java +++ b/src/main/scala/resonantinduction/mechanical/gear/dev/NodeGear.java @@ -1,9 +1,9 @@ -package mechanical.gear.dev; +package resonantinduction.mechanical.gear.dev; import java.util.HashMap; import java.util.WeakHashMap; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.grid.INode; import resonant.api.grid.INodeProvider; import resonant.lib.type.Pair; diff --git a/src/main/scala/mechanical/gear/dev/NodeGenerator.java b/src/main/scala/resonantinduction/mechanical/gear/dev/NodeGenerator.java similarity index 65% rename from src/main/scala/mechanical/gear/dev/NodeGenerator.java rename to src/main/scala/resonantinduction/mechanical/gear/dev/NodeGenerator.java index 57228b18e..3fb7a8e81 100644 --- a/src/main/scala/mechanical/gear/dev/NodeGenerator.java +++ b/src/main/scala/resonantinduction/mechanical/gear/dev/NodeGenerator.java @@ -1,8 +1,8 @@ -package mechanical.gear.dev; +package resonantinduction.mechanical.gear.dev; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; -/** Added to any device that generates a mechanical rotational force as part of the network +/** Added to any device that generates a resonantinduction.mechanical rotational force as part of the network * * @author Darkguardsman */ public class NodeGenerator extends NodeGear diff --git a/src/main/scala/mechanical/gearshaft/GearShaftNode.java b/src/main/scala/resonantinduction/mechanical/gearshaft/GearShaftNode.java similarity index 90% rename from src/main/scala/mechanical/gearshaft/GearShaftNode.java rename to src/main/scala/resonantinduction/mechanical/gearshaft/GearShaftNode.java index 3aa0a66ca..97aa66d3e 100644 --- a/src/main/scala/mechanical/gearshaft/GearShaftNode.java +++ b/src/main/scala/resonantinduction/mechanical/gearshaft/GearShaftNode.java @@ -1,16 +1,16 @@ -package mechanical.gearshaft; +package resonantinduction.mechanical.gearshaft; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.grid.INodeProvider; import resonantinduction.core.interfaces.IMechanicalNode; -import mechanical.energy.grid.MechanicalNode; -import mechanical.gear.PartGear; -import universalelectricity.api.vector.Vector3; +import resonantinduction.mechanical.energy.grid.MechanicalNode; +import resonantinduction.mechanical.gear.PartGear; +import universalelectricity.core.transform.vector.Vector3; public class GearShaftNode extends MechanicalNode { @@ -75,7 +75,7 @@ public class GearShaftNode extends MechanicalNode { if (!getConnections().containsValue(checkDir) && (checkDir == shaft().placementSide || checkDir == shaft().placementSide.getOpposite())) { - TileEntity checkTile = new Vector3(shaft().tile()).translate(checkDir).getTileEntity(world()); + TileEntity checkTile = new Vector3(shaft().tile()).add(checkDir).getTileEntity(world()); if (checkTile instanceof INodeProvider) { diff --git a/src/main/scala/mechanical/gearshaft/ItemGearShaft.java b/src/main/scala/resonantinduction/mechanical/gearshaft/ItemGearShaft.java similarity index 96% rename from src/main/scala/mechanical/gearshaft/ItemGearShaft.java rename to src/main/scala/resonantinduction/mechanical/gearshaft/ItemGearShaft.java index 06f9cd420..9bb97ff74 100644 --- a/src/main/scala/mechanical/gearshaft/ItemGearShaft.java +++ b/src/main/scala/resonantinduction/mechanical/gearshaft/ItemGearShaft.java @@ -1,4 +1,4 @@ -package mechanical.gearshaft; +package resonantinduction.mechanical.gearshaft; import java.util.List; diff --git a/src/main/scala/mechanical/gearshaft/PartGearShaft.java b/src/main/scala/resonantinduction/mechanical/gearshaft/PartGearShaft.java similarity index 93% rename from src/main/scala/mechanical/gearshaft/PartGearShaft.java rename to src/main/scala/resonantinduction/mechanical/gearshaft/PartGearShaft.java index bdef63298..80ead7ca3 100644 --- a/src/main/scala/mechanical/gearshaft/PartGearShaft.java +++ b/src/main/scala/resonantinduction/mechanical/gearshaft/PartGearShaft.java @@ -1,13 +1,13 @@ -package mechanical.gearshaft; +package resonantinduction.mechanical.gearshaft; import java.util.Collection; import java.util.HashSet; import java.util.Set; -import mechanical.energy.grid.PartMechanical; +import resonantinduction.mechanical.energy.grid.PartMechanical; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.ForgeDirection; -import mechanical.Mechanical; +import net.minecraftforge.common.util.ForgeDirection; +import resonantinduction.mechanical.Mechanical; import codechicken.lib.raytracer.IndexedCuboid6; import codechicken.lib.vec.Cuboid6; import codechicken.lib.vec.Vector3; diff --git a/src/main/scala/mechanical/gearshaft/RenderGearShaft.java b/src/main/scala/resonantinduction/mechanical/gearshaft/RenderGearShaft.java similarity index 95% rename from src/main/scala/mechanical/gearshaft/RenderGearShaft.java rename to src/main/scala/resonantinduction/mechanical/gearshaft/RenderGearShaft.java index f6adb15af..6a0eaa02b 100644 --- a/src/main/scala/mechanical/gearshaft/RenderGearShaft.java +++ b/src/main/scala/resonantinduction/mechanical/gearshaft/RenderGearShaft.java @@ -1,10 +1,10 @@ -package mechanical.gearshaft; +package resonantinduction.mechanical.gearshaft; import static org.lwjgl.opengl.GL11.glRotatef; import net.minecraft.item.ItemStack; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; diff --git a/src/main/scala/mechanical/logistic/belt/BlockDetector.java b/src/main/scala/resonantinduction/mechanical/logistic/belt/BlockDetector.java similarity index 88% rename from src/main/scala/mechanical/logistic/belt/BlockDetector.java rename to src/main/scala/resonantinduction/mechanical/logistic/belt/BlockDetector.java index d4dff653e..f986a8f9c 100644 --- a/src/main/scala/mechanical/logistic/belt/BlockDetector.java +++ b/src/main/scala/resonantinduction/mechanical/logistic/belt/BlockDetector.java @@ -1,12 +1,12 @@ -package mechanical.logistic.belt; +package resonantinduction.mechanical.logistic.belt; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonantinduction.core.Reference; import resonantinduction.core.prefab.imprint.BlockImprintable; import universalelectricity.api.UniversalElectricity; @@ -16,7 +16,7 @@ import cpw.mods.fml.relauncher.SideOnly; /** @author Briman0094 */ public class BlockDetector extends BlockImprintable { - Icon front_red, front_green, side_green, side_red; + IIcon front_red, front_green, side_green, side_red; public BlockDetector(int id) { @@ -26,7 +26,7 @@ public class BlockDetector extends BlockImprintable @SideOnly(Side.CLIENT) @Override - public void registerIcons(IconRegister iconReg) + public void registerIcons(IIconRegister iconReg) { front_green = iconReg.registerIcon(Reference.PREFIX + "detector_front_green"); front_red = iconReg.registerIcon(Reference.PREFIX + "detector_front_red"); @@ -37,7 +37,7 @@ public class BlockDetector extends BlockImprintable @Override @SideOnly(Side.CLIENT) - public Icon getBlockTexture(IBlockAccess iBlockAccess, int x, int y, int z, int side) + public IIcon getBlockTexture(IBlockAccess iBlockAccess, int x, int y, int z, int side) { boolean isInverted = false; boolean isFront = false; @@ -54,7 +54,7 @@ public class BlockDetector extends BlockImprintable @Override @SideOnly(Side.CLIENT) - public Icon getIcon(int side, int metadata) + public IIcon getIcon(int side, int metadata) { if (side == ForgeDirection.SOUTH.ordinal()) { diff --git a/src/main/scala/mechanical/logistic/belt/BlockManipulator.java b/src/main/scala/resonantinduction/mechanical/logistic/belt/BlockManipulator.java similarity index 98% rename from src/main/scala/mechanical/logistic/belt/BlockManipulator.java rename to src/main/scala/resonantinduction/mechanical/logistic/belt/BlockManipulator.java index 1081d3615..796a59397 100644 --- a/src/main/scala/mechanical/logistic/belt/BlockManipulator.java +++ b/src/main/scala/resonantinduction/mechanical/logistic/belt/BlockManipulator.java @@ -1,4 +1,4 @@ -package mechanical.logistic.belt; +package resonantinduction.mechanical.logistic.belt; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/scala/mechanical/logistic/belt/BlockRejector.java b/src/main/scala/resonantinduction/mechanical/logistic/belt/BlockRejector.java similarity index 71% rename from src/main/scala/mechanical/logistic/belt/BlockRejector.java rename to src/main/scala/resonantinduction/mechanical/logistic/belt/BlockRejector.java index ef32ebc62..d7b5251ef 100644 --- a/src/main/scala/mechanical/logistic/belt/BlockRejector.java +++ b/src/main/scala/resonantinduction/mechanical/logistic/belt/BlockRejector.java @@ -1,8 +1,8 @@ -package mechanical.logistic.belt; +package resonantinduction.mechanical.logistic.belt; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.World; import resonant.lib.render.block.BlockRenderingHandler; import resonantinduction.core.Reference; @@ -14,7 +14,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockRejector extends BlockImprintable { @SideOnly(Side.CLIENT) - protected Icon front; + protected IIcon front; public BlockRejector(int id) { @@ -55,15 +55,15 @@ public class BlockRejector extends BlockImprintable @SideOnly(Side.CLIENT) @Override - public void registerIcons(IconRegister par1IconRegister) + public void registerIcons(IIconRegister par1IIconRegister) { - this.blockIcon = par1IconRegister.registerIcon(Reference.PREFIX + "imprinter_bottom"); - this.front = par1IconRegister.registerIcon(Reference.PREFIX + "disk_tray"); + this.blockIcon = par1IIconRegister.registerIcon(Reference.PREFIX + "imprinter_bottom"); + this.front = par1IIconRegister.registerIcon(Reference.PREFIX + "disk_tray"); } @Override @SideOnly(Side.CLIENT) - public Icon getIcon(int side, int metadata) + public IIcon getIcon(int side, int metadata) { if (side == metadata) { diff --git a/src/main/scala/mechanical/logistic/belt/ModelManipulator.java b/src/main/scala/resonantinduction/mechanical/logistic/belt/ModelManipulator.java similarity index 99% rename from src/main/scala/mechanical/logistic/belt/ModelManipulator.java rename to src/main/scala/resonantinduction/mechanical/logistic/belt/ModelManipulator.java index 1e1ef7120..2747d9e31 100644 --- a/src/main/scala/mechanical/logistic/belt/ModelManipulator.java +++ b/src/main/scala/resonantinduction/mechanical/logistic/belt/ModelManipulator.java @@ -1,4 +1,4 @@ -package mechanical.logistic.belt; +package resonantinduction.mechanical.logistic.belt; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/scala/mechanical/logistic/belt/ModelRejectorPiston.java b/src/main/scala/resonantinduction/mechanical/logistic/belt/ModelRejectorPiston.java similarity index 99% rename from src/main/scala/mechanical/logistic/belt/ModelRejectorPiston.java rename to src/main/scala/resonantinduction/mechanical/logistic/belt/ModelRejectorPiston.java index 7b0365913..314bb9d16 100644 --- a/src/main/scala/mechanical/logistic/belt/ModelRejectorPiston.java +++ b/src/main/scala/resonantinduction/mechanical/logistic/belt/ModelRejectorPiston.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package mechanical.logistic.belt; +package resonantinduction.mechanical.logistic.belt; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/scala/mechanical/logistic/belt/RenderManipulator.java b/src/main/scala/resonantinduction/mechanical/logistic/belt/RenderManipulator.java similarity index 96% rename from src/main/scala/mechanical/logistic/belt/RenderManipulator.java rename to src/main/scala/resonantinduction/mechanical/logistic/belt/RenderManipulator.java index 0c8b42ffd..df197d750 100644 --- a/src/main/scala/mechanical/logistic/belt/RenderManipulator.java +++ b/src/main/scala/resonantinduction/mechanical/logistic/belt/RenderManipulator.java @@ -1,4 +1,4 @@ -package mechanical.logistic.belt; +package resonantinduction.mechanical.logistic.belt; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/src/main/scala/mechanical/logistic/belt/RenderRejector.java b/src/main/scala/resonantinduction/mechanical/logistic/belt/RenderRejector.java similarity index 96% rename from src/main/scala/mechanical/logistic/belt/RenderRejector.java rename to src/main/scala/resonantinduction/mechanical/logistic/belt/RenderRejector.java index 7208d17af..c323dacd3 100644 --- a/src/main/scala/mechanical/logistic/belt/RenderRejector.java +++ b/src/main/scala/resonantinduction/mechanical/logistic/belt/RenderRejector.java @@ -1,4 +1,4 @@ -package mechanical.logistic.belt; +package resonantinduction.mechanical.logistic.belt; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/src/main/scala/mechanical/logistic/belt/TileDetector.java b/src/main/scala/resonantinduction/mechanical/logistic/belt/TileDetector.java similarity index 95% rename from src/main/scala/mechanical/logistic/belt/TileDetector.java rename to src/main/scala/resonantinduction/mechanical/logistic/belt/TileDetector.java index f9733da1b..c43cc90c8 100644 --- a/src/main/scala/mechanical/logistic/belt/TileDetector.java +++ b/src/main/scala/resonantinduction/mechanical/logistic/belt/TileDetector.java @@ -1,4 +1,4 @@ -package mechanical.logistic.belt; +package resonantinduction.mechanical.logistic.belt; import java.util.ArrayList; @@ -9,12 +9,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.network.IPacketReceiver; import resonant.lib.network.PacketHandler; import resonantinduction.core.ResonantInduction; import resonantinduction.core.prefab.imprint.TileFilterable; -import mechanical.Mechanical; +import resonantinduction.mechanical.Mechanical; import com.google.common.io.ByteArrayDataInput; diff --git a/src/main/scala/mechanical/logistic/belt/TileManipulator.java b/src/main/scala/resonantinduction/mechanical/logistic/belt/TileManipulator.java similarity index 91% rename from src/main/scala/mechanical/logistic/belt/TileManipulator.java rename to src/main/scala/resonantinduction/mechanical/logistic/belt/TileManipulator.java index 67a5fd6d1..9c25c6762 100644 --- a/src/main/scala/mechanical/logistic/belt/TileManipulator.java +++ b/src/main/scala/resonantinduction/mechanical/logistic/belt/TileManipulator.java @@ -1,4 +1,4 @@ -package mechanical.logistic.belt; +package resonantinduction.mechanical.logistic.belt; import java.util.List; @@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.IManipulator; import resonant.api.IRotatable; import resonant.lib.network.IPacketReceiver; @@ -16,7 +16,7 @@ import resonant.lib.utility.inventory.InternalInventoryHandler; import resonantinduction.core.ResonantInduction; import resonantinduction.core.prefab.imprint.ItemImprint; import resonantinduction.core.prefab.imprint.TileFilterable; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import com.google.common.io.ByteArrayDataInput; @@ -78,13 +78,13 @@ public class TileManipulator extends TileFilterable implements IRotatable, IMani Vector3 inputPosition = new Vector3(this); /** output location up */ Vector3 outputUp = new Vector3(this); - outputUp.translate(ForgeDirection.UP); + outputUp.add(ForgeDirection.UP); /** output location down */ Vector3 outputDown = new Vector3(this); - outputDown.translate(ForgeDirection.DOWN); + outputDown.add(ForgeDirection.DOWN); /** output location facing */ Vector3 outputPosition = new Vector3(this); - outputPosition.translate(this.getDirection().getOpposite()); + outputPosition.add(this.getDirection().getOpposite()); /** Prevents manipulators from spamming and duping items. */ if (outputPosition.getTileEntity(this.worldObj) instanceof TileManipulator) @@ -139,13 +139,13 @@ public class TileManipulator extends TileFilterable implements IRotatable, IMani { this.isRedstonePowered = false; /** input location up */ - Vector3 inputUp = new Vector3(this).translate(ForgeDirection.UP); + Vector3 inputUp = new Vector3(this).add(ForgeDirection.UP); /** input location down */ - Vector3 inputDown = new Vector3(this).translate(ForgeDirection.DOWN); + Vector3 inputDown = new Vector3(this).add(ForgeDirection.DOWN); /** input location facing */ - Vector3 inputPosition = new Vector3(this).translate(this.getDirection().getOpposite()); + Vector3 inputPosition = new Vector3(this).add(this.getDirection().getOpposite()); /** output location facing */ - Vector3 outputPosition = new Vector3(this).translate(this.getDirection()); + Vector3 outputPosition = new Vector3(this).add(this.getDirection()); ItemStack itemStack = invHelper().tryGrabFromPosition(inputUp, ForgeDirection.UP, 1); diff --git a/src/main/scala/mechanical/logistic/belt/TileRejector.java b/src/main/scala/resonantinduction/mechanical/logistic/belt/TileRejector.java similarity index 93% rename from src/main/scala/mechanical/logistic/belt/TileRejector.java rename to src/main/scala/resonantinduction/mechanical/logistic/belt/TileRejector.java index c7d46895c..2415d5336 100644 --- a/src/main/scala/mechanical/logistic/belt/TileRejector.java +++ b/src/main/scala/resonantinduction/mechanical/logistic/belt/TileRejector.java @@ -1,4 +1,4 @@ -package mechanical.logistic.belt; +package resonantinduction.mechanical.logistic.belt; import java.util.List; @@ -9,12 +9,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.IEntityConveyor; import resonant.lib.network.IPacketReceiverWithID; import resonantinduction.core.ResonantInduction; import resonantinduction.core.prefab.imprint.TileFilterable; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import com.google.common.io.ByteArrayDataInput; @@ -34,7 +34,7 @@ public class TileRejector extends TileFilterable implements IPacketReceiverWithI this.firePiston = false; Vector3 searchPosition = new Vector3(this); - searchPosition.translate(this.getDirection()); + searchPosition.add(this.getDirection()); TileEntity tileEntity = searchPosition.getTileEntity(this.worldObj); try diff --git a/src/main/scala/mechanical/logistic/belt/TileSorter.java b/src/main/scala/resonantinduction/mechanical/logistic/belt/TileSorter.java similarity index 94% rename from src/main/scala/mechanical/logistic/belt/TileSorter.java rename to src/main/scala/resonantinduction/mechanical/logistic/belt/TileSorter.java index 774c2e492..e20b606b7 100644 --- a/src/main/scala/mechanical/logistic/belt/TileSorter.java +++ b/src/main/scala/resonantinduction/mechanical/logistic/belt/TileSorter.java @@ -1,4 +1,4 @@ -package mechanical.logistic.belt; +package resonantinduction.mechanical.logistic.belt; import java.util.ArrayList; import java.util.List; @@ -15,7 +15,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; @@ -29,7 +29,7 @@ import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.Reference; import resonantinduction.core.prefab.imprint.ItemImprint; import universalelectricity.api.UniversalElectricity; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -130,7 +130,7 @@ public class TileSorter extends TileInventory { ForgeDirection dir = ForgeDirection.getOrientation(i); - int blockID = position().translate(dir).getBlockID(world()); + int blockID = position().add(dir).getBlock(world()); Block block = Block.blocksList[blockID]; if (block == null || !Block.isNormalCube(blockID)) @@ -148,7 +148,7 @@ public class TileSorter extends TileInventory { ForgeDirection dir = ForgeDirection.getOrientation(i); - int blockID = position().translate(dir).getBlockID(world()); + int blockID = position().add(dir).getBlock(world()); Block block = Block.blocksList[blockID]; if (block == null || !Block.isNormalCube(blockID)) @@ -156,7 +156,7 @@ public class TileSorter extends TileInventory possibleDirections.add(dir); } - if (position().translate(dir).getTileEntity(world()) instanceof IInventory) + if (position().add(dir).getTileEntity(world()) instanceof IInventory) { inventoryDirections.add(dir); } @@ -170,7 +170,7 @@ public class TileSorter extends TileInventory ForgeDirection dir = possibleDirections.get(size > 1 ? world().rand.nextInt(size - 1) : 0); - Vector3 spawn = center().translate(dir, 1); + Vector3 spawn = center().add(dir, 1); TileEntity tile = spawn.getTileEntity(world()); ItemStack remain = sortStack; diff --git a/src/main/scala/mechanical/logistic/rail/IRailing.java b/src/main/scala/resonantinduction/mechanical/logistic/rail/IRailing.java similarity index 75% rename from src/main/scala/mechanical/logistic/rail/IRailing.java rename to src/main/scala/resonantinduction/mechanical/logistic/rail/IRailing.java index 33d8df24f..5db8a1bd3 100644 --- a/src/main/scala/mechanical/logistic/rail/IRailing.java +++ b/src/main/scala/resonantinduction/mechanical/logistic/rail/IRailing.java @@ -1,4 +1,4 @@ -package mechanical.logistic.rail; +package resonantinduction.mechanical.logistic.rail; import universalelectricity.api.net.IConnector; import universalelectricity.api.net.INodeNetwork; diff --git a/src/main/scala/mechanical/logistic/rail/PartRailing.java b/src/main/scala/resonantinduction/mechanical/logistic/rail/PartRailing.java similarity index 88% rename from src/main/scala/mechanical/logistic/rail/PartRailing.java rename to src/main/scala/resonantinduction/mechanical/logistic/rail/PartRailing.java index 81de320e7..00d17ef14 100644 --- a/src/main/scala/mechanical/logistic/rail/PartRailing.java +++ b/src/main/scala/resonantinduction/mechanical/logistic/rail/PartRailing.java @@ -1,10 +1,10 @@ -package mechanical.logistic.rail; +package resonantinduction.mechanical.logistic.rail; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonantinduction.core.prefab.part.PartFramedConnection; -import mechanical.fluid.pipe.EnumPipeMaterial; +import resonantinduction.mechanical.fluid.pipe.EnumPipeMaterial; import universalelectricity.api.net.INodeNetwork; import codechicken.microblock.IHollowConnect; import codechicken.multipart.JNormalOcclusion; diff --git a/src/main/scala/mechanical/logistic/rail/RedstoneControl.java b/src/main/scala/resonantinduction/mechanical/logistic/rail/RedstoneControl.java similarity index 94% rename from src/main/scala/mechanical/logistic/rail/RedstoneControl.java rename to src/main/scala/resonantinduction/mechanical/logistic/rail/RedstoneControl.java index 68221700f..a0787bf7d 100644 --- a/src/main/scala/mechanical/logistic/rail/RedstoneControl.java +++ b/src/main/scala/resonantinduction/mechanical/logistic/rail/RedstoneControl.java @@ -1,4 +1,4 @@ -package mechanical.logistic.rail; +package resonantinduction.mechanical.logistic.rail; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/scala/mechanical/process/crusher/RenderMechanicalPiston.java b/src/main/scala/resonantinduction/mechanical/process/crusher/RenderMechanicalPiston.java similarity index 96% rename from src/main/scala/mechanical/process/crusher/RenderMechanicalPiston.java rename to src/main/scala/resonantinduction/mechanical/process/crusher/RenderMechanicalPiston.java index 9eba754eb..f317604f8 100644 --- a/src/main/scala/mechanical/process/crusher/RenderMechanicalPiston.java +++ b/src/main/scala/resonantinduction/mechanical/process/crusher/RenderMechanicalPiston.java @@ -1,11 +1,11 @@ -package mechanical.process.crusher; +package resonantinduction.mechanical.process.crusher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import org.apache.commons.lang3.ArrayUtils; import org.lwjgl.opengl.GL11; diff --git a/src/main/scala/mechanical/process/crusher/TileMechanicalPiston.java b/src/main/scala/resonantinduction/mechanical/process/crusher/TileMechanicalPiston.java similarity index 89% rename from src/main/scala/mechanical/process/crusher/TileMechanicalPiston.java rename to src/main/scala/resonantinduction/mechanical/process/crusher/TileMechanicalPiston.java index 3892ce753..ae23267ee 100644 --- a/src/main/scala/mechanical/process/crusher/TileMechanicalPiston.java +++ b/src/main/scala/resonantinduction/mechanical/process/crusher/TileMechanicalPiston.java @@ -1,16 +1,16 @@ -package mechanical.process.crusher; +package resonantinduction.mechanical.process.crusher; import cpw.mods.fml.common.Loader; import cpw.mods.fml.relauncher.ReflectionHelper; -import mechanical.energy.grid.MechanicalNode; -import mechanical.energy.grid.TileMechanical; +import resonantinduction.mechanical.energy.grid.MechanicalNode; +import resonantinduction.mechanical.energy.grid.TileMechanical; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.IRotatable; import resonant.api.recipe.MachineRecipes; import resonant.api.recipe.RecipeResource; @@ -18,7 +18,7 @@ import resonant.lib.config.Config; import resonant.lib.utility.MovementUtility; import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.ResonantInduction; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import java.lang.reflect.Method; @@ -67,13 +67,13 @@ public class TileMechanicalPiston extends TileMechanical implements IRotatable if (markRevolve) { - Vector3 movePosition = new Vector3(TileMechanicalPiston.this).translate(getDirection()); + Vector3 movePosition = new Vector3(TileMechanicalPiston.this).add(getDirection()); if (!hitOreBlock(movePosition)) { if (!worldObj.isRemote) { - Vector3 moveNewPosition = movePosition.clone().translate(getDirection()); + Vector3 moveNewPosition = movePosition.clone().add(getDirection()); if (canMove(movePosition, moveNewPosition)) { @@ -88,7 +88,7 @@ public class TileMechanicalPiston extends TileMechanical implements IRotatable public boolean hitOreBlock(Vector3 blockPos) { - Block block = Block.blocksList[blockPos.getBlockID(world())]; + Block block = Block.blocksList[blockPos.getBlock(world())]; if (block != null) { @@ -112,7 +112,7 @@ public class TileMechanicalPiston extends TileMechanical implements IRotatable { if (Math.random() <= recipe.getChance()) { - InventoryUtility.dropItemStack(world(), blockPos.clone().translate(0.5), recipe.getItemStack(), 10, 0); + InventoryUtility.dropItemStack(world(), blockPos.clone().add(0.5), recipe.getItemStack(), 10, 0); } } @@ -120,7 +120,7 @@ public class TileMechanicalPiston extends TileMechanical implements IRotatable } } - ResonantInduction.proxy.renderBlockParticle(worldObj, blockPos.clone().translate(0.5), new Vector3((Math.random() - 0.5f) * 3, (Math.random() - 0.5f) * 3, (Math.random() - 0.5f) * 3), block.blockID, 1); + ResonantInduction.proxy.renderBlockParticle(worldObj, blockPos.clone().add(0.5), new Vector3((Math.random() - 0.5f) * 3, (Math.random() - 0.5f) * 3, (Math.random() - 0.5f) * 3), block.blockID, 1); breakCount--; return true; } @@ -150,9 +150,9 @@ public class TileMechanicalPiston extends TileMechanical implements IRotatable } /** Check Target */ - int targetBlockID = to.getBlockID(worldObj); + int targetBlock = to.getBlock(worldObj); - if (!(worldObj.isAirBlock(to.intX(), to.intY(), to.intZ()) || (targetBlockID > 0 && (Block.blocksList[targetBlockID].isBlockReplaceable(worldObj, to.intX(), to.intY(), to.intZ()))))) + if (!(worldObj.isAirBlock(to.intX(), to.intY(), to.intZ()) || (targetBlock > 0 && (Block.blocksList[targetBlock].isBlockReplaceable(worldObj, to.intX(), to.intY(), to.intZ()))))) { return false; } @@ -162,7 +162,7 @@ public class TileMechanicalPiston extends TileMechanical implements IRotatable public void move(Vector3 from, Vector3 to) { - int blockID = from.getBlockID(worldObj); + int blockID = from.getBlock(worldObj); int blockMetadata = from.getBlockMetadata(worldObj); TileEntity tileEntity = from.getTileEntity(worldObj); @@ -232,7 +232,7 @@ public class TileMechanicalPiston extends TileMechanical implements IRotatable public void notifyChanges(Vector3 pos) { - worldObj.notifyBlocksOfNeighborChange(pos.intX(), pos.intY(), pos.intZ(), pos.getBlockID(worldObj)); + worldObj.notifyBlocksOfNeighborChange(pos.intX(), pos.intY(), pos.intZ(), pos.getBlock(worldObj)); TileEntity newTile = pos.getTileEntity(worldObj); diff --git a/src/main/scala/mechanical/process/edit/TileBreaker.java b/src/main/scala/resonantinduction/mechanical/process/edit/TileBreaker.java similarity index 87% rename from src/main/scala/mechanical/process/edit/TileBreaker.java rename to src/main/scala/resonantinduction/mechanical/process/edit/TileBreaker.java index aa4b70bd9..e10a74f87 100644 --- a/src/main/scala/mechanical/process/edit/TileBreaker.java +++ b/src/main/scala/resonantinduction/mechanical/process/edit/TileBreaker.java @@ -1,17 +1,17 @@ -package mechanical.process.edit; +package resonantinduction.mechanical.process.edit; import java.util.ArrayList; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.IRotatable; import resonant.lib.content.module.TileBase; import resonant.lib.content.module.TileRender; @@ -20,7 +20,7 @@ import resonant.lib.network.PacketHandler; import resonant.lib.render.RotatedTextureRenderer; import resonant.lib.utility.inventory.InternalInventoryHandler; import resonantinduction.core.ResonantInduction; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import universalelectricity.api.vector.VectorWorld; import com.google.common.io.ByteArrayDataInput; @@ -35,7 +35,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class TileBreaker extends TileBase implements IRotatable, IPacketReceiver { @SideOnly(Side.CLIENT) - private static Icon iconFront, iconBack; + private static IIcon iconFront, iconBack; private boolean doWork = false; private InternalInventoryHandler invHandler; private byte place_delay = 0; @@ -101,10 +101,10 @@ public class TileBreaker extends TileBase implements IRotatable, IPacketReceiver if (isIndirectlyPowered()) { ForgeDirection dir = getDirection(); - Vector3 check = position().translate(dir); - VectorWorld put = (VectorWorld) position().translate(dir.getOpposite()); + Vector3 check = position().add(dir); + VectorWorld put = (VectorWorld) position().add(dir.getOpposite()); - Block block = Block.blocksList[check.getBlockID(world())]; + Block block = Block.blocksList[check.getBlock(world())]; if (block != null) { @@ -146,7 +146,7 @@ public class TileBreaker extends TileBase implements IRotatable, IPacketReceiver @Override @SideOnly(Side.CLIENT) - public Icon getIcon(IBlockAccess access, int side) + public IIcon getIcon(IBlockAccess access, int side) { int meta = access.getBlockMetadata(x(), y(), z()); @@ -164,7 +164,7 @@ public class TileBreaker extends TileBase implements IRotatable, IPacketReceiver @Override @SideOnly(Side.CLIENT) - public Icon getIcon(int side, int meta) + public IIcon getIcon(int side, int meta) { if (side == (meta ^ 1)) { @@ -180,7 +180,7 @@ public class TileBreaker extends TileBase implements IRotatable, IPacketReceiver @Override @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister iconRegister) + public void registerIcons(IIconRegister iconRegister) { super.registerIcons(iconRegister); iconFront = iconRegister.registerIcon(getTextureName() + "_front"); diff --git a/src/main/scala/mechanical/process/edit/TilePlacer.java b/src/main/scala/resonantinduction/mechanical/process/edit/TilePlacer.java similarity index 91% rename from src/main/scala/mechanical/process/edit/TilePlacer.java rename to src/main/scala/resonantinduction/mechanical/process/edit/TilePlacer.java index 000846625..398ddd89e 100644 --- a/src/main/scala/mechanical/process/edit/TilePlacer.java +++ b/src/main/scala/resonantinduction/mechanical/process/edit/TilePlacer.java @@ -1,17 +1,17 @@ -package mechanical.process.edit; +package resonantinduction.mechanical.process.edit; import java.util.EnumSet; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraft.util.ChatMessageComponent; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; @@ -26,7 +26,7 @@ import resonant.lib.utility.LanguageUtility; import resonant.lib.utility.inventory.InternalInventoryHandler; import resonant.lib.utility.inventory.InventoryUtility; import resonantinduction.core.ResonantInduction; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; import com.google.common.io.ByteArrayDataInput; @@ -40,7 +40,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class TilePlacer extends TileInventory implements IRotatable, IPacketReceiver { @SideOnly(Side.CLIENT) - private static Icon iconFront, iconBack; + private static IIcon iconFront, iconBack; private boolean doWork = false; private boolean autoPullItems = false; private byte placeDelay = 0; @@ -120,7 +120,7 @@ public class TilePlacer extends TileInventory implements IRotatable, IPacketRece { //Tries to place the item stack into the world int side = 0; - Vector3 placePos = position().translate(getDirection()); + Vector3 placePos = position().add(getDirection()); ItemStack placeStack = getStackInSlot(0); if (InventoryUtility.placeItemBlock(world(), placePos.intX(), placePos.intY(), placePos.intZ(), placeStack, side)) @@ -199,7 +199,7 @@ public class TilePlacer extends TileInventory implements IRotatable, IPacketRece @Override @SideOnly(Side.CLIENT) - public Icon getIcon(IBlockAccess access, int side) + public IIcon getIcon(IBlockAccess access, int side) { int meta = access.getBlockMetadata(x(), y(), z()); @@ -217,7 +217,7 @@ public class TilePlacer extends TileInventory implements IRotatable, IPacketRece @Override @SideOnly(Side.CLIENT) - public Icon getIcon(int side, int meta) + public IIcon getIcon(int side, int meta) { if (side == (meta ^ 1)) { @@ -233,7 +233,7 @@ public class TilePlacer extends TileInventory implements IRotatable, IPacketRece @Override @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister iconRegister) + public void registerIcons(IIconRegister iconRegister) { super.registerIcons(iconRegister); iconFront = iconRegister.registerIcon(getTextureName() + "_front"); diff --git a/src/main/scala/mechanical/process/grinder/GrinderNode.java b/src/main/scala/resonantinduction/mechanical/process/grinder/GrinderNode.java similarity index 84% rename from src/main/scala/mechanical/process/grinder/GrinderNode.java rename to src/main/scala/resonantinduction/mechanical/process/grinder/GrinderNode.java index 674196ba7..d2745db35 100644 --- a/src/main/scala/mechanical/process/grinder/GrinderNode.java +++ b/src/main/scala/resonantinduction/mechanical/process/grinder/GrinderNode.java @@ -1,7 +1,7 @@ -package mechanical.process.grinder; +package resonantinduction.mechanical.process.grinder; -import mechanical.energy.grid.MechanicalNode; -import net.minecraftforge.common.ForgeDirection; +import resonantinduction.mechanical.energy.grid.MechanicalNode; +import net.minecraftforge.common.util.ForgeDirection; import resonantinduction.core.interfaces.IMechanicalNode; /** Node just for the grinder diff --git a/src/main/scala/mechanical/process/grinder/RenderGrindingWheel.java b/src/main/scala/resonantinduction/mechanical/process/grinder/RenderGrindingWheel.java similarity index 94% rename from src/main/scala/mechanical/process/grinder/RenderGrindingWheel.java rename to src/main/scala/resonantinduction/mechanical/process/grinder/RenderGrindingWheel.java index 2cfa1972b..713198840 100644 --- a/src/main/scala/mechanical/process/grinder/RenderGrindingWheel.java +++ b/src/main/scala/resonantinduction/mechanical/process/grinder/RenderGrindingWheel.java @@ -1,4 +1,4 @@ -package mechanical.process.grinder; +package resonantinduction.mechanical.process.grinder; import static org.lwjgl.opengl.GL11.glPopMatrix; import static org.lwjgl.opengl.GL11.glPushMatrix; @@ -9,7 +9,7 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.lib.render.RenderUtility; import resonantinduction.core.Reference; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/scala/mechanical/process/grinder/TileGrindingWheel.java b/src/main/scala/resonantinduction/mechanical/process/grinder/TileGrindingWheel.java similarity index 95% rename from src/main/scala/mechanical/process/grinder/TileGrindingWheel.java rename to src/main/scala/resonantinduction/mechanical/process/grinder/TileGrindingWheel.java index 10c1cf715..05fdf0e33 100644 --- a/src/main/scala/mechanical/process/grinder/TileGrindingWheel.java +++ b/src/main/scala/resonantinduction/mechanical/process/grinder/TileGrindingWheel.java @@ -1,12 +1,12 @@ -package mechanical.process.grinder; +package resonantinduction.mechanical.process.grinder; -import mechanical.energy.grid.TileMechanical; +import resonantinduction.mechanical.energy.grid.TileMechanical; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.IRotatable; import resonant.api.recipe.MachineRecipes; import resonant.api.recipe.RecipeResource; @@ -16,7 +16,7 @@ import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.ResonantInduction.RecipeType; import resonantinduction.core.Timer; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; /** * @author Calclavia @@ -161,7 +161,7 @@ public class TileGrindingWheel extends TileMechanical implements IRotatable if (grindingItem.getEntityItem().getItem() instanceof ItemBlock) { - ResonantInduction.proxy.renderBlockParticle(worldObj, new Vector3(grindingItem), new Vector3((Math.random() - 0.5f) * 3, (Math.random() - 0.5f) * 3, (Math.random() - 0.5f) * 3), ((ItemBlock) grindingItem.getEntityItem().getItem()).getBlockID(), 1); + ResonantInduction.proxy.renderBlockParticle(worldObj, new Vector3(grindingItem), new Vector3((Math.random() - 0.5f) * 3, (Math.random() - 0.5f) * 3, (Math.random() - 0.5f) * 3), ((ItemBlock) grindingItem.getEntityItem().getItem()).getBlock(), 1); } else { diff --git a/src/main/scala/mechanical/process/mixer/MixerNode.java b/src/main/scala/resonantinduction/mechanical/process/mixer/MixerNode.java similarity index 69% rename from src/main/scala/mechanical/process/mixer/MixerNode.java rename to src/main/scala/resonantinduction/mechanical/process/mixer/MixerNode.java index a17f86d1e..4c8e23879 100644 --- a/src/main/scala/mechanical/process/mixer/MixerNode.java +++ b/src/main/scala/resonantinduction/mechanical/process/mixer/MixerNode.java @@ -1,9 +1,9 @@ -package mechanical.process.mixer; +package resonantinduction.mechanical.process.mixer; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import resonant.api.grid.INodeProvider; import resonantinduction.core.interfaces.IMechanicalNode; -import mechanical.energy.grid.MechanicalNode; +import resonantinduction.mechanical.energy.grid.MechanicalNode; public class MixerNode extends MechanicalNode { diff --git a/src/main/scala/mechanical/process/mixer/RenderMixer.java b/src/main/scala/resonantinduction/mechanical/process/mixer/RenderMixer.java similarity index 97% rename from src/main/scala/mechanical/process/mixer/RenderMixer.java rename to src/main/scala/resonantinduction/mechanical/process/mixer/RenderMixer.java index 834665ae4..d69050718 100644 --- a/src/main/scala/mechanical/process/mixer/RenderMixer.java +++ b/src/main/scala/resonantinduction/mechanical/process/mixer/RenderMixer.java @@ -1,4 +1,4 @@ -package mechanical.process.mixer; +package resonantinduction.mechanical.process.mixer; import static org.lwjgl.opengl.GL11.glPopMatrix; import static org.lwjgl.opengl.GL11.glPushMatrix; diff --git a/src/main/scala/mechanical/process/mixer/TileMixer.java b/src/main/scala/resonantinduction/mechanical/process/mixer/TileMixer.java similarity index 91% rename from src/main/scala/mechanical/process/mixer/TileMixer.java rename to src/main/scala/resonantinduction/mechanical/process/mixer/TileMixer.java index d10a56000..2d5345274 100644 --- a/src/main/scala/mechanical/process/mixer/TileMixer.java +++ b/src/main/scala/resonantinduction/mechanical/process/mixer/TileMixer.java @@ -1,10 +1,10 @@ -package mechanical.process.mixer; +package resonantinduction.mechanical.process.mixer; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import mechanical.energy.grid.TileMechanical; +import resonantinduction.mechanical.energy.grid.TileMechanical; import net.minecraft.block.Block; import net.minecraft.block.BlockFluid; import net.minecraft.block.material.Material; @@ -14,7 +14,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidBlock; import resonant.api.recipe.MachineRecipes; import resonant.lib.utility.inventory.InventoryUtility; @@ -23,7 +23,7 @@ import resonantinduction.core.ResonantInduction.RecipeType; import resonantinduction.core.Timer; import resonantinduction.core.resource.ResourceGenerator; import resonantinduction.core.resource.fluid.BlockFluidMixture; -import universalelectricity.api.vector.Vector3; +import universalelectricity.core.transform.vector.Vector3; /** * @author Calclavia @@ -58,7 +58,7 @@ public class TileMixer extends TileMechanical implements IInventory { if (x != 0 && z != 0) { - int id = position().translate(x, 0, z).getBlockID(world()); + int id = position().add(x, 0, z).getBlock(world()); Block block = Block.blocksList[id]; if (block != null && !(block instanceof IFluidBlock) && !(block instanceof BlockFluid)) @@ -176,9 +176,9 @@ public class TileMixer extends TileMechanical implements IInventory { Vector3 mixPosition = new Vector3(entity.posX, yCoord, entity.posZ); - if (mixPosition.getBlockID(world()) != blockID()) + if (mixPosition.getBlock(world()) != blockID()) { - Block block = Block.blocksList[mixPosition.getBlockID(worldObj)]; + Block block = Block.blocksList[mixPosition.getBlock(worldObj)]; Block blockFluidFinite = ResourceGenerator.getMixture(ResourceGenerator.getName(entity.getEntityItem())); if (blockFluidFinite != null) @@ -189,7 +189,7 @@ public class TileMixer extends TileMechanical implements IInventory if (((BlockFluidMixture) block).mix(worldObj, mixPosition.intX(), mixPosition.intY(), mixPosition.intZ(), itemStack)) { - worldObj.notifyBlocksOfNeighborChange(mixPosition.intX(), mixPosition.intY(), mixPosition.intZ(), mixPosition.getBlockID(worldObj)); + worldObj.notifyBlocksOfNeighborChange(mixPosition.intX(), mixPosition.intY(), mixPosition.intZ(), mixPosition.getBlock(worldObj)); return true; } } @@ -232,7 +232,7 @@ public class TileMixer extends TileMechanical implements IInventory { if (!worldObj.isRemote) { - Vector3 spawnVector = new Vector3(this).translate(ForgeDirection.getOrientation(worldObj.rand.nextInt(4) + 2)).translate(0.5); + Vector3 spawnVector = new Vector3(this).add(ForgeDirection.getOrientation(worldObj.rand.nextInt(4) + 2)).add(0.5); InventoryUtility.dropItemStack(worldObj, spawnVector, itemstack, 20, 0); } }