From f848a8e7b8755b065a39081177eaa99de4bfb351 Mon Sep 17 00:00:00 2001 From: Robert S Date: Mon, 20 Oct 2014 13:45:50 -0400 Subject: [PATCH] Changes to position and packet usage due to RE update --- .../archaic/blocks/TileImprinter.scala | 9 +- .../archaic/blocks/TileTurntable.scala | 2 +- .../archaic/crate/TileCrate.scala | 12 +-- .../engineering/TileEngineeringTable.scala | 8 +- .../archaic/firebox/TileFirebox.scala | 4 +- .../archaic/fluid/grate/TileGrate.scala | 4 +- .../archaic/fluid/gutter/TileGutter.scala | 2 +- .../archaic/fluid/tank/TileTank.scala | 10 +-- .../archaic/process/TileCastingMold.scala | 2 +- .../archaic/process/TileMillstone.scala | 2 +- .../atomic/blocks/TileElectromagnet.scala | 4 +- .../atomic/blocks/TileSiren.scala | 10 +-- .../machine/accelerator/GuiAccelerator.scala | 2 +- .../machine/accelerator/TileAccelerator.scala | 6 +- .../machine/boiler/TileNuclearBoiler.scala | 2 +- .../machine/centrifuge/TileCentrifuge.scala | 4 +- .../fulmination/FulminationHandler.scala | 4 +- .../atomic/machine/plasma/TilePlasma.scala | 6 +- .../machine/plasma/TilePlasmaHeater.scala | 4 +- .../quantum/TileQuantumAssembler.scala | 6 +- .../machine/reactor/TileReactorCell.scala | 26 +++--- .../machine/reactor/TileReactorDrain.scala | 10 +-- .../machine/thermometer/TileThermometer.scala | 6 +- .../core/prefab/node/TileTankNode.scala | 4 +- .../electrical/battery/TileBattery.scala | 4 +- .../electrical/generator/TileThermopile.scala | 4 +- .../laser/emitter/TileLaserEmitter.scala | 4 +- .../focus/crystal/TileFocusCrystal.scala | 14 +-- .../laser/focus/mirror/TileMirror.scala | 14 +-- .../laser/receiver/TileLaserReceiver.scala | 8 +- .../electrical/tesla/TileTesla.scala | 86 +++++++++---------- .../mechanical/fluid/transport/TilePump.scala | 5 +- .../mechanical/machine/TileDetector.scala | 6 +- .../mechanical/machine/edit/TileBreaker.scala | 6 +- .../mechanical/machine/edit/TilePlacer.scala | 27 ++---- .../mechanical/mech/TileMechanical.scala | 4 +- .../crusher/RenderMechanicalPiston.scala | 2 +- .../crusher/TileMechanicalPiston.scala | 2 +- .../process/grinder/TileGrindingWheel.scala | 2 +- .../mech/process/mixer/TileMixer.scala | 8 +- .../mechanical/mech/turbine/TileTurbine.scala | 2 +- .../mech/turbine/TileWaterTurbine.scala | 2 +- 42 files changed, 157 insertions(+), 192 deletions(-) diff --git a/src/main/scala/resonantinduction/archaic/blocks/TileImprinter.scala b/src/main/scala/resonantinduction/archaic/blocks/TileImprinter.scala index efc952766..4d6c80c8e 100644 --- a/src/main/scala/resonantinduction/archaic/blocks/TileImprinter.scala +++ b/src/main/scala/resonantinduction/archaic/blocks/TileImprinter.scala @@ -26,7 +26,7 @@ import resonant.lib.network.handle.IPacketReceiver import resonant.lib.render.RenderItemOverlayUtility import resonant.lib.utility.inventory.InventoryUtility import resonantinduction.core.Reference -import universalelectricity.core.transform.vector.{Vector2, Vector3, VectorWorld} +import universalelectricity.core.transform.vector.{Vector2, Vector3} import scala.collection.JavaConversions._ @@ -371,12 +371,12 @@ class TileImprinter extends TileAdvanced(Material.circuits) with ISidedInventory InventoryUtility.dropItemStack(world, new Vector3(player), checkStack, 0) inventory(slotID) = null } - world.markBlockForUpdate(x, y, z) + world.markBlockForUpdate(xi, yi, zi) return true } } } - world.markBlockForUpdate(x, y, z) + world.markBlockForUpdate(xi, yi, zi) } return true } @@ -399,8 +399,7 @@ class TileImprinter extends TileAdvanced(Material.circuits) with ISidedInventory override def onNeighborChanged(block: Block) { - val vec: VectorWorld = new VectorWorld(this) - val b: Block = vec.add(ForgeDirection.getOrientation(1)).getBlock + val b: Block = asVectorWorld.add(ForgeDirection.getOrientation(1)).getBlock if (Blocks.piston_head eq b) { onInventoryChanged diff --git a/src/main/scala/resonantinduction/archaic/blocks/TileTurntable.scala b/src/main/scala/resonantinduction/archaic/blocks/TileTurntable.scala index a5c1135e6..75245a8dc 100644 --- a/src/main/scala/resonantinduction/archaic/blocks/TileTurntable.scala +++ b/src/main/scala/resonantinduction/archaic/blocks/TileTurntable.scala @@ -36,7 +36,7 @@ class TileTurntable extends SpatialBlock(Material.piston) with TRotatable override def update() { - updateTurntableState(world, x, y, z) + updateTurntableState(world, xi, yi, zi) } private def updateTurntableState(world: World, x: Int, y: Int, z: Int) diff --git a/src/main/scala/resonantinduction/archaic/crate/TileCrate.scala b/src/main/scala/resonantinduction/archaic/crate/TileCrate.scala index bd5cc6cf2..ae949eb84 100644 --- a/src/main/scala/resonantinduction/archaic/crate/TileCrate.scala +++ b/src/main/scala/resonantinduction/archaic/crate/TileCrate.scala @@ -156,12 +156,10 @@ class TileCrate extends TileInventory(Material.rock) with TPacketReceiver with I return TileCrate.getSlotCount(this.getBlockMetadata) } - def read(data: ByteBuf, player: EntityPlayer, packet: PacketType) + override def read(data: ByteBuf, player: EntityPlayer, packet: PacketType) { if (this.worldObj.isRemote) { - try - { if (data.readBoolean) { this.sampleStack = ItemStack.loadItemStackFromNBT(data.readTag()) @@ -171,14 +169,6 @@ class TileCrate extends TileInventory(Material.rock) with TPacketReceiver with I { this.sampleStack = null } - } - catch - { - case e: Exception => - { - e.printStackTrace - } - } } } diff --git a/src/main/scala/resonantinduction/archaic/engineering/TileEngineeringTable.scala b/src/main/scala/resonantinduction/archaic/engineering/TileEngineeringTable.scala index 5a078b5f8..220b582e4 100644 --- a/src/main/scala/resonantinduction/archaic/engineering/TileEngineeringTable.scala +++ b/src/main/scala/resonantinduction/archaic/engineering/TileEngineeringTable.scala @@ -246,7 +246,7 @@ class TileEngineeringTable extends TileInventory(Material.wood) with IPacketRece override def onRemove(block: Block, par6: Int) { - val stack: ItemStack = ItemBlockSaved.getItemStackWithNBT(block, world, x, y, z) + val stack: ItemStack = ItemBlockSaved.getItemStackWithNBT(block, world, xi, yi, zi) InventoryUtility.dropItemStack(world, center, stack) } @@ -341,7 +341,7 @@ class TileEngineeringTable extends TileInventory(Material.wood) with IPacketRece var idDisplacement: Int = TileEngineeringTable.PLAYER_OUTPUT_END for (dir <- ForgeDirection.VALID_DIRECTIONS) { - val tile: TileEntity = new Vector3(this).add(dir).getTileEntity(worldObj) + val tile: TileEntity = asVectorWorld.add(dir).getTileEntity if (tile.isInstanceOf[IInventory]) { val inventory: IInventory = tile.asInstanceOf[IInventory] @@ -408,7 +408,7 @@ class TileEngineeringTable extends TileInventory(Material.wood) with IPacketRece var idDisplacement: Int = TileEngineeringTable.PLAYER_OUTPUT_END for (dir <- ForgeDirection.VALID_DIRECTIONS) { - val tile: TileEntity = new Vector3(this).add(dir).getTileEntity(worldObj) + val tile: TileEntity = asVectorWorld.add(dir).getTileEntity if (tile.isInstanceOf[IInventory]) { val inventory: IInventory = tile.asInstanceOf[IInventory] @@ -646,7 +646,7 @@ class TileEngineeringTable extends TileInventory(Material.wood) with IPacketRece var temporaryInvID: Int = TileEngineeringTable.PLAYER_OUTPUT_END for (dir <- ForgeDirection.VALID_DIRECTIONS) { - val tile: TileEntity = new Vector3(this).add(dir).getTileEntity(worldObj) + val tile: TileEntity = asVectorWorld.add(dir).getTileEntity(worldObj) if (tile.isInstanceOf[IInventory]) { val inventory: IInventory = tile.asInstanceOf[IInventory] diff --git a/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.scala b/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.scala index f72b03d7f..f6adc78ca 100644 --- a/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.scala +++ b/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.scala @@ -106,7 +106,7 @@ class TileFirebox extends TileElectricInventory(Material.rock) with IPacketRecei { if (FluidRegistry.getFluid("steam") != null) { - 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)) + MinecraftForge.EVENT_BUS.post(new BoilEvent(worldObj, asVectorWorld.add(0, 1, 0), new FluidStack(FluidRegistry.WATER, volume), new FluidStack(FluidRegistry.getFluid("steam"), volume), 2, false)) boiledVolume += volume } if (boiledVolume >= FluidContainerRegistry.BUCKET_VOLUME) @@ -269,7 +269,7 @@ class TileFirebox extends TileElectricInventory(Material.rock) with IPacketRecei override def use(player: EntityPlayer, side: Int, hit: Vector3): Boolean = { - if (FluidUtility.playerActivatedFluidItem(world, x, y, z, player, side)) + if (FluidUtility.playerActivatedFluidItem(world, xi, yi, zi, player, side)) { return true } diff --git a/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.scala b/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.scala index 81e93deed..83222bced 100644 --- a/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.scala +++ b/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.scala @@ -106,7 +106,7 @@ class TileGrate extends TilePressureNode(Material.rock) with IRotatable if (gratePath == null) { gratePath = new GratePathfinder(true) - gratePath.startFill(new Vector3(this), getTank().getFluid.getFluid.getID) + gratePath.startFill(asVectorWorld, getTank().getFluid.getFluid.getID) } val filledInWorld = gratePath.tryFill(getFluidAmount, blockEffect) getTank().drain(filledInWorld, true) @@ -120,7 +120,7 @@ class TileGrate extends TilePressureNode(Material.rock) with IRotatable if (gratePath == null) { gratePath = new GratePathfinder(false) - if (!gratePath.startDrain(new Vector3(this))) + if (!gratePath.startDrain(asVector3)) { resetPath() } diff --git a/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.scala b/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.scala index 62f80560c..4a78644c7 100644 --- a/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.scala +++ b/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.scala @@ -81,7 +81,7 @@ class TileGutter extends TilePressureNode(Material.rock) { val dir: ForgeDirection = ForgeDirection.getOrientation(i) val pressure: Int = getPressure(dir) - val _position: Vector3 = position.add(dir) + val _position: Vector3 = asVector3.add(dir) val checkTile: TileEntity = _position.getTileEntity(world) if (checkTile.isInstanceOf[TileGutter]) { diff --git a/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.scala b/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.scala index 0a8933888..b02572251 100644 --- a/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.scala +++ b/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.scala @@ -107,7 +107,7 @@ class TileTank extends TileTankNode(Material.iron) with ISneakPickup { if (!world.isRemote) { - return FluidUtility.playerActivatedFluidItem(world, x, y, z, player, side) + return FluidUtility.playerActivatedFluidItem(world, xi, yi, zi, player, side) } return true } @@ -140,10 +140,10 @@ class TileTank extends TileTankNode(Material.iron) with ISneakPickup GL11.glScaled(0.99, 0.99, 0.99) val tank: IFluidTank = getTank val percentageFilled: Double = tank.getFluidAmount.asInstanceOf[Double] / tank.getCapacity.asInstanceOf[Double] - val ySouthEast: Double = FluidUtility.getAveragePercentageFilledForSides(classOf[TileTank], percentageFilled, world, new Vector3(this), ForgeDirection.SOUTH, ForgeDirection.EAST) - val yNorthEast: Double = FluidUtility.getAveragePercentageFilledForSides(classOf[TileTank], percentageFilled, world, new Vector3(this), ForgeDirection.NORTH, ForgeDirection.EAST) - val ySouthWest: Double = FluidUtility.getAveragePercentageFilledForSides(classOf[TileTank], percentageFilled, world, new Vector3(this), ForgeDirection.SOUTH, ForgeDirection.WEST) - val yNorthWest: Double = FluidUtility.getAveragePercentageFilledForSides(classOf[TileTank], percentageFilled, world, new Vector3(this), ForgeDirection.NORTH, ForgeDirection.WEST) + val ySouthEast: Double = FluidUtility.getAveragePercentageFilledForSides(classOf[TileTank], percentageFilled, world, asVector3, ForgeDirection.SOUTH, ForgeDirection.EAST) + val yNorthEast: Double = FluidUtility.getAveragePercentageFilledForSides(classOf[TileTank], percentageFilled, world, asVector3, ForgeDirection.NORTH, ForgeDirection.EAST) + val ySouthWest: Double = FluidUtility.getAveragePercentageFilledForSides(classOf[TileTank], percentageFilled, world, asVector3, ForgeDirection.SOUTH, ForgeDirection.WEST) + val yNorthWest: Double = FluidUtility.getAveragePercentageFilledForSides(classOf[TileTank], percentageFilled, world, asVector3, ForgeDirection.NORTH, ForgeDirection.WEST) FluidRenderUtility.renderFluidTesselation(tank, ySouthEast, yNorthEast, ySouthWest, yNorthWest) } GL11.glPopMatrix diff --git a/src/main/scala/resonantinduction/archaic/process/TileCastingMold.scala b/src/main/scala/resonantinduction/archaic/process/TileCastingMold.scala index 627fd26e3..15a86297a 100644 --- a/src/main/scala/resonantinduction/archaic/process/TileCastingMold.scala +++ b/src/main/scala/resonantinduction/archaic/process/TileCastingMold.scala @@ -75,7 +75,7 @@ class TileCastingMold extends TileInventory(Material.rock) with IFluidHandler wi override def update { - val checkPos: Vector3 = new Vector3(this).add(0, 1, 0) + val checkPos: Vector3 = asVector3.add(0, 1, 0) val drainStack: FluidStack = 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.scala b/src/main/scala/resonantinduction/archaic/process/TileMillstone.scala index 6f8b6b20a..07e16a571 100644 --- a/src/main/scala/resonantinduction/archaic/process/TileMillstone.scala +++ b/src/main/scala/resonantinduction/archaic/process/TileMillstone.scala @@ -145,7 +145,7 @@ class TileMillstone extends TileInventory(Material.rock) with IPacketReceiver setInventorySlotContents(0, current) player.inventory.setInventorySlotContents(player.inventory.currentItem, null) } - world.markBlockForUpdate(x, y, z) + world.markBlockForUpdate(xi, yi, zi) return false } } \ No newline at end of file diff --git a/src/main/scala/resonantinduction/atomic/blocks/TileElectromagnet.scala b/src/main/scala/resonantinduction/atomic/blocks/TileElectromagnet.scala index 9952007be..d94c4d672 100644 --- a/src/main/scala/resonantinduction/atomic/blocks/TileElectromagnet.scala +++ b/src/main/scala/resonantinduction/atomic/blocks/TileElectromagnet.scala @@ -114,7 +114,7 @@ class TileElectromagnet extends SpatialBlock(Material.iron) with IElectromagnet for (dir <- ForgeDirection.VALID_DIRECTIONS) { - val check = new Vector3(tile) + dir + val check = asVector3 + dir val checkTile = check.getTileEntity(world) if (checkTile != null && checkTile.getClass == tile.getClass && check.getBlockMetadata(world) == tile.getBlockMetadata) @@ -123,7 +123,7 @@ class TileElectromagnet extends SpatialBlock(Material.iron) with IElectromagnet } } - RenderBlockUtility.tessellateBlockWithConnectedTextures(sideMap, world, x, y, z, tile.getBlockType, null, RenderUtility.getIcon(edgeTexture)) + RenderBlockUtility.tessellateBlockWithConnectedTextures(sideMap, world, xi, yi, zi, tile.getBlockType, null, RenderUtility.getIcon(edgeTexture)) } } \ No newline at end of file diff --git a/src/main/scala/resonantinduction/atomic/blocks/TileSiren.scala b/src/main/scala/resonantinduction/atomic/blocks/TileSiren.scala index 273554ea2..2166fe07d 100644 --- a/src/main/scala/resonantinduction/atomic/blocks/TileSiren.scala +++ b/src/main/scala/resonantinduction/atomic/blocks/TileSiren.scala @@ -19,13 +19,13 @@ class TileSiren extends SpatialBlock(Material.wood) val world: World = worldObj if (world != null) { - val metadata: Int = world.getBlockMetadata(x, y, z) - if (world.getBlockPowerInput(x, y, z) > 0) + val metadata: Int = world.getBlockMetadata(xi, yi, zi) + if (world.getBlockPowerInput(xi, yi, zi) > 0) { var volume: Float = 0.5f for (i <- 0 to 6) { - val check: Vector3 = position.add(ForgeDirection.getOrientation(i)) + val check: Vector3 = asVector3.add(ForgeDirection.getOrientation(i)) if (check.getBlock(world) eq getBlockType) { volume *= 1.5f @@ -38,7 +38,7 @@ class TileSiren extends SpatialBlock(Material.wood) override def configure(player: EntityPlayer, side: Int, hit: Vector3): Boolean = { - var metadata: Int = world.getBlockMetadata(x, y, z) + var metadata: Int = world.getBlockMetadata(xi, yi, zi) if (player.isSneaking) { metadata -= 1 @@ -48,7 +48,7 @@ class TileSiren extends SpatialBlock(Material.wood) metadata += 1 } metadata = Math.max(metadata % 16, 0) - world.setBlockMetadataWithNotify(x, y, z, metadata, 2) + world.setBlockMetadataWithNotify(xi, yi, zi, metadata, 2) return true } } \ No newline at end of file diff --git a/src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.scala b/src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.scala index b89f16841..9d911dd13 100644 --- a/src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.scala +++ b/src/main/scala/resonantinduction/atomic/machine/accelerator/GuiAccelerator.scala @@ -15,7 +15,7 @@ class GuiAccelerator(player: EntityPlayer, tileEntity: TileAccelerator) extends { this.fontRendererObj.drawString("Accelerator", 40, 10, 4210752) var status: String = "" - val position: Vector3 = new Vector3(this.tileEntity) + val position: Vector3 = tileEntity.asVector3 position.add(this.tileEntity.getDirection.getOpposite) if (!EntityParticle.canSpawnParticle(this.tileEntity.world, position)) { diff --git a/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.scala b/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.scala index c2cdb37d5..6af3cb89d 100644 --- a/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.scala +++ b/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.scala @@ -104,13 +104,13 @@ class TileAccelerator extends TileElectricInventory(Material.iron) with IElectro { if (getStackInSlot(0) != null && lastSpawnTick >= 40) { - val spawn_vec: Vector3 = new Vector3(this) + val spawn_vec: Vector3 = asVector3 spawn_vec.add(getDirection.getOpposite) spawn_vec.add(0.5f) if (EntityParticle.canSpawnParticle(worldObj, spawn_vec)) { totalEnergyConsumed = 0 - entityParticle = new EntityParticle(worldObj, spawn_vec, new Vector3(this), getDirection.getOpposite) + entityParticle = new EntityParticle(worldObj, spawn_vec, asVector3, getDirection.getOpposite) worldObj.spawnEntityInWorld(entityParticle) CalculateParticleDensity decrStackSize(0, 1) @@ -175,7 +175,7 @@ class TileAccelerator extends TileElectricInventory(Material.iron) with IElectro { if (!world.isRemote) { - player.openGui(AtomicContent, 0, world, x, y, z) + player.openGui(AtomicContent, 0, world, xi, yi, zi) } return true } diff --git a/src/main/scala/resonantinduction/atomic/machine/boiler/TileNuclearBoiler.scala b/src/main/scala/resonantinduction/atomic/machine/boiler/TileNuclearBoiler.scala index dd9849809..28152b951 100644 --- a/src/main/scala/resonantinduction/atomic/machine/boiler/TileNuclearBoiler.scala +++ b/src/main/scala/resonantinduction/atomic/machine/boiler/TileNuclearBoiler.scala @@ -129,7 +129,7 @@ class TileNuclearBoiler extends TileElectricInventory(Material.iron) with IPacke override def getDescPacket: PacketTile = { - return new PacketTile(x, y, z, Array(this.timer, AtomicContent.getFluidAmount(this.waterTank.getFluid), AtomicContent.getFluidAmount(this.gasTank.getFluid))) + return new PacketTile(xi, yi, zi, Array(this.timer, AtomicContent.getFluidAmount(this.waterTank.getFluid), AtomicContent.getFluidAmount(this.gasTank.getFluid))) } def sendDescPack diff --git a/src/main/scala/resonantinduction/atomic/machine/centrifuge/TileCentrifuge.scala b/src/main/scala/resonantinduction/atomic/machine/centrifuge/TileCentrifuge.scala index c7c566e51..df9a34ab8 100644 --- a/src/main/scala/resonantinduction/atomic/machine/centrifuge/TileCentrifuge.scala +++ b/src/main/scala/resonantinduction/atomic/machine/centrifuge/TileCentrifuge.scala @@ -54,7 +54,7 @@ class TileCentrifuge extends TileElectricInventory(Material.iron) with IPacketRe for (i <- 0 to 6) { val direction: ForgeDirection = ForgeDirection.getOrientation(i) - val tileEntity: TileEntity = new Vector3(this).add(direction).getTileEntity(world) + val tileEntity: TileEntity = asVector3.add(direction).getTileEntity(world) if (tileEntity.isInstanceOf[IFluidHandler] && tileEntity.getClass != this.getClass) { val fluidHandler: IFluidHandler = (tileEntity.asInstanceOf[IFluidHandler]) @@ -127,7 +127,7 @@ class TileCentrifuge extends TileElectricInventory(Material.iron) with IPacketRe override def getDescriptionPacket: Packet = { - return ResonantEngine.instance.packetHandler.toMCPacket(new PacketTile(x, y, z, Array(this.timer, AtomicContent.getFluidAmount(this.gasTank.getFluid)))) + return ResonantEngine.instance.packetHandler.toMCPacket(new PacketTile(xi, yi, zi, Array(this.timer, AtomicContent.getFluidAmount(this.gasTank.getFluid)))) } /** diff --git a/src/main/scala/resonantinduction/atomic/machine/fulmination/FulminationHandler.scala b/src/main/scala/resonantinduction/atomic/machine/fulmination/FulminationHandler.scala index 8d2026ca3..517bb18c8 100644 --- a/src/main/scala/resonantinduction/atomic/machine/fulmination/FulminationHandler.scala +++ b/src/main/scala/resonantinduction/atomic/machine/fulmination/FulminationHandler.scala @@ -46,7 +46,7 @@ class FulminationHandler { if (!tileEntity.isInvalid) { - val tileDiDian: Vector3 = new Vector3(tileEntity) + val tileDiDian: Vector3 = tileEntity.asVector3 tileDiDian.add(0.5f) val juLi: Double = tileDiDian.distance(new Vector3(evt.x, evt.y, evt.z)) if (juLi <= evt.iExplosion.getRadius && juLi > 0) @@ -66,7 +66,7 @@ class FulminationHandler for (tileEntity <- avaliableGenerators) { val density: Float = evt.world.getBlockDensity(Vec3.createVectorHelper(evt.x, evt.y, evt.z), AtomicContent.blockFulmination.getCollisionBoundingBoxFromPool(evt.world, tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord)) - val juLi: Double = new Vector3(tileEntity).distance(new Vector3(evt.x, evt.y, evt.z)) + val juLi: Double = tileEntity.asVector3.distance(new Vector3(evt.x, evt.y, evt.z)) var energy: Long = Math.min(maxEnergyPerGenerator, maxEnergyPerGenerator / (juLi / evt.iExplosion.getRadius)).asInstanceOf[Long] energy = Math.max((1 - density) * energy, 0).asInstanceOf[Long] tileEntity.energy.receiveEnergy(energy, true) diff --git a/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasma.scala b/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasma.scala index 54355cc7c..ac255ddb1 100644 --- a/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasma.scala +++ b/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasma.scala @@ -15,7 +15,7 @@ import resonant.api.event.PlasmaEvent import resonant.content.prefab.java.TileAdvanced import resonant.engine.grid.thermal.ThermalGrid import resonant.lib.config.Config -import universalelectricity.core.transform.vector.{Vector3, VectorWorld} +import universalelectricity.core.transform.vector.Vector3 object TilePlasma { @@ -58,7 +58,7 @@ class TilePlasma extends TileAdvanced(Material.lava) override def update { super.update - ThermalGrid.addTemperature(new VectorWorld(this), ((temperature - ThermalGrid.getTemperature(new VectorWorld(this))) * 0.1f).asInstanceOf[Float]) + ThermalGrid.addTemperature(asVectorWorld, ((temperature - ThermalGrid.getTemperature(asVectorWorld)) * 0.1f).asInstanceOf[Float]) if (ticks % 20 == 0) { temperature /= 1.5 @@ -71,7 +71,7 @@ class TilePlasma extends TileAdvanced(Material.lava) { if (worldObj.rand.nextFloat < 0.4) { - val diDian: Vector3 = new Vector3(this) + val diDian: Vector3 = asVector3 diDian.add(ForgeDirection.getOrientation(i)) val tileEntity: TileEntity = diDian.getTileEntity(worldObj) if (!(tileEntity.isInstanceOf[TilePlasma])) diff --git a/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasmaHeater.scala b/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasmaHeater.scala index 74832802f..1786bd08f 100644 --- a/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasmaHeater.scala +++ b/src/main/scala/resonantinduction/atomic/machine/plasma/TilePlasmaHeater.scala @@ -59,7 +59,7 @@ class TilePlasmaHeater extends TileElectric(Material.iron) with IPacketReceiver } if (ticks % 80 == 0) { - world.markBlockForUpdate(x, y, z) + world.markBlockForUpdate(xi, yi, zi) } } @@ -186,7 +186,7 @@ class TilePlasmaHeater extends TileElectric(Material.iron) with IPacketReceiver override def use(player: EntityPlayer, side: Int, hit: Vector3): Boolean = { - return FluidUtility.playerActivatedFluidItem(world, x, y, z, player, side) + return FluidUtility.playerActivatedFluidItem(world, xi, yi, zi, player, side) } } \ No newline at end of file diff --git a/src/main/scala/resonantinduction/atomic/machine/quantum/TileQuantumAssembler.scala b/src/main/scala/resonantinduction/atomic/machine/quantum/TileQuantumAssembler.scala index 2849eea8f..eb892ecd1 100644 --- a/src/main/scala/resonantinduction/atomic/machine/quantum/TileQuantumAssembler.scala +++ b/src/main/scala/resonantinduction/atomic/machine/quantum/TileQuantumAssembler.scala @@ -49,7 +49,7 @@ class TileQuantumAssembler extends TileElectricInventory(Material.iron) with IPa { if (!world.isRemote) { - player.openGui(AtomicContent, 0, world, x, y, z) + player.openGui(AtomicContent, 0, world, xi, yi, zi) } return true } @@ -137,9 +137,9 @@ class TileQuantumAssembler extends TileElectricInventory(Material.iron) with IPa { if (this.getStackInSlot(6) != null) { - return new PacketTile(x, y, z, Array(time, getStackInSlot(6))) + return new PacketTile(xi, yi, zi, Array(time, getStackInSlot(6))) } - return new PacketTile(x, y, z, Array(time, -1, -1, -1)) + return new PacketTile(xi, yi, zi, Array(time, -1, -1, -1)) } /** diff --git a/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorCell.scala b/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorCell.scala index 294d97c77..6bf4b7559 100644 --- a/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorCell.scala +++ b/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorCell.scala @@ -79,8 +79,8 @@ class TileReactorCell extends TileInventory(Material.iron) with IMultiBlockStruc val mainTile: TileReactorCell = getLowest mainTile.getMultiBlock.deconstruct mainTile.getMultiBlock.construct - val top: Boolean = new Vector3(this).add(new Vector3(0, 1, 0)).getTileEntity(worldObj).isInstanceOf[TileReactorCell] - val bottom: Boolean = new Vector3(this).add(new Vector3(0, -1, 0)).getTileEntity(worldObj).isInstanceOf[TileReactorCell] + val top: Boolean = asVector3.add(new Vector3(0, 1, 0)).getTileEntity(worldObj).isInstanceOf[TileReactorCell] + val bottom: Boolean = asVector3.add(new Vector3(0, -1, 0)).getTileEntity(worldObj).isInstanceOf[TileReactorCell] if (top && bottom) { worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, 1, 3) @@ -98,7 +98,7 @@ class TileReactorCell extends TileInventory(Material.iron) with IMultiBlockStruc def getLowest: TileReactorCell = { var lowest: TileReactorCell = this - val checkPosition: Vector3 = new Vector3(this) + val checkPosition: Vector3 = asVector3 while (true) { val t: TileEntity = checkPosition.getTileEntity(this.worldObj) @@ -141,7 +141,7 @@ class TileReactorCell extends TileInventory(Material.iron) with IMultiBlockStruc if (drain != null && drain.amount >= FluidContainerRegistry.BUCKET_VOLUME) { val spawnDir: ForgeDirection = ForgeDirection.getOrientation(worldObj.rand.nextInt(3) + 2) - val spawnPos: Vector3 = new Vector3(this) + spawnDir + spawnDir + val spawnPos: Vector3 = asVector3 + spawnDir + spawnDir spawnPos.add(0, Math.max(worldObj.rand.nextInt(getHeight) - 1, 0), 0) if (worldObj.isAirBlock(spawnPos.xi, spawnPos.yi, spawnPos.zi)) { @@ -173,13 +173,13 @@ class TileReactorCell extends TileInventory(Material.iron) with IMultiBlockStruc val entities: List[EntityLiving] = worldObj.getEntitiesWithinAABB(classOf[EntityLiving], AxisAlignedBB.getBoundingBox(xCoord - TileReactorCell.RADIUS * 2, yCoord - TileReactorCell.RADIUS * 2, zCoord - TileReactorCell.RADIUS * 2, xCoord + TileReactorCell.RADIUS * 2, yCoord + TileReactorCell.RADIUS * 2, zCoord + TileReactorCell.RADIUS * 2)).asInstanceOf[List[EntityLiving]] for (entity <- entities) { - PoisonRadiation.INSTANCE.poisonEntity(new Vector3(this), entity) + PoisonRadiation.INSTANCE.poisonEntity(asVector3, entity) } } } } } - temperature = ThermalGrid.getTemperature(new VectorWorld(this)) + temperature = ThermalGrid.getTemperature(asVectorWorld) if (internalEnergy - prevInternalEnergy > 0) { var deltaT: Float = ThermalPhysics.getTemperatureForEnergy(mass, specificHeatCapacity, ((internalEnergy - prevInternalEnergy) * 0.15).asInstanceOf[Long]) @@ -188,7 +188,7 @@ class TileReactorCell extends TileInventory(Material.iron) with IMultiBlockStruc for (i <- 0 to 5) { { - val checkAdjacent: Vector3 = new Vector3(this).add(ForgeDirection.getOrientation(i)) + val checkAdjacent: Vector3 = asVector3.add(ForgeDirection.getOrientation(i)) if (checkAdjacent.getBlock(worldObj) == AtomicContent.blockControlRod) { deltaT /= 1.1f @@ -196,7 +196,7 @@ class TileReactorCell extends TileInventory(Material.iron) with IMultiBlockStruc } } } - ThermalGrid.addTemperature(new VectorWorld(this), deltaT) + ThermalGrid.addTemperature(asVectorWorld, deltaT) if (worldObj.rand.nextInt(80) == 0 && this.getTemperature >= 373) { worldObj.playSoundEffect(this.xCoord + 0.5F, this.yCoord + 0.5F, this.zCoord + 0.5F, "Fluid.lava", 0.5F, 2.1F + (worldObj.rand.nextFloat - worldObj.rand.nextFloat) * 0.85F) @@ -234,7 +234,7 @@ class TileReactorCell extends TileInventory(Material.iron) with IMultiBlockStruc internalEnergy = 0 if (isOverToxic) { - val leakPos: VectorWorld = new VectorWorld(this).add(worldObj.rand.nextInt(20) - 10, worldObj.rand.nextInt(20) - 10, worldObj.rand.nextInt(20) - 10) + val leakPos: VectorWorld = asVectorWorld.add(worldObj.rand.nextInt(20) - 10, worldObj.rand.nextInt(20) - 10, worldObj.rand.nextInt(20) - 10) val block: Block = leakPos.getBlock if (block == Blocks.grass) { @@ -255,7 +255,7 @@ class TileReactorCell extends TileInventory(Material.iron) with IMultiBlockStruc { shouldUpdate = false notifyChange - sendPacket(getDescPacket) + //sendPacket(getDescPacket) } } else @@ -281,7 +281,7 @@ class TileReactorCell extends TileInventory(Material.iron) with IMultiBlockStruc def getHeight: Int = { var height: Int = 0 - val checkPosition: Vector3 = new Vector3(this) + val checkPosition: Vector3 = asVector3 var tile: TileEntity = this while (tile.isInstanceOf[TileReactorCell]) { @@ -320,7 +320,7 @@ class TileReactorCell extends TileInventory(Material.iron) with IMultiBlockStruc override def getMultiBlockVectors: java.lang.Iterable[Vector3] = { val vectors: List[Vector3] = new ArrayList[Vector3] - val checkPosition: Vector3 = new Vector3(this) + val checkPosition: Vector3 = asVector3 while (true) { val t: TileEntity = checkPosition.getTileEntity(this.worldObj) @@ -339,7 +339,7 @@ class TileReactorCell extends TileInventory(Material.iron) with IMultiBlockStruc def getPosition: Vector3 = { - return new Vector3(this) + return asVector3 } /** Reads a tile entity from NBT. */ diff --git a/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorDrain.scala b/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorDrain.scala index 5d5018952..5ae1eb2cb 100644 --- a/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorDrain.scala +++ b/src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorDrain.scala @@ -32,7 +32,7 @@ class TileReactorDrain extends TileAdvanced(Material.iron) with IFluidHandler { this.tanks.clear val world: World = this.worldObj - val position: Vector3 = new Vector3(this) + val position: Vector3 = asVector3 val finder: Pathfinder = new Pathfinder(new IPathCallBack { def getConnectedNodes(finder: Pathfinder, currentNode: Vector3): Set[Vector3] = @@ -64,7 +64,7 @@ class TileReactorDrain extends TileAdvanced(Material.iron) with IFluidHandler } return false } - }).init(new Vector3(this).add(ForgeDirection.getOrientation(this.getBlockMetadata).getOpposite)) + }).init(asVector3.add(ForgeDirection.getOrientation(this.getBlockMetadata).getOpposite)) import scala.collection.JavaConversions._ for (node <- finder.results) { @@ -174,17 +174,17 @@ class TileReactorDrain extends TileAdvanced(Material.iron) with IFluidHandler override def onPlaced(entityLiving: EntityLivingBase, itemStack: ItemStack) { - if (MathHelper.abs(entityLiving.posX.asInstanceOf[Float] - x) < 2.0F && MathHelper.abs(entityLiving.posZ.asInstanceOf[Float] - z) < 2.0F) + if (MathHelper.abs(entityLiving.posX.asInstanceOf[Float] - xi) < 2.0F && MathHelper.abs(entityLiving.posZ.asInstanceOf[Float] - zi) < 2.0F) { val d0: Double = entityLiving.posY + 1.82D - entityLiving.yOffset if (d0 - y > 2.0D) { - world.setBlockMetadataWithNotify(x, y, z, 1, 3) + world.setBlockMetadataWithNotify(xi, yi, zi, 1, 3) return } if (y - d0 > 0.0D) { - world.setBlockMetadataWithNotify(x, y, z, 0, 3) + world.setBlockMetadataWithNotify(xi, yi, zi, 0, 3) return } } diff --git a/src/main/scala/resonantinduction/atomic/machine/thermometer/TileThermometer.scala b/src/main/scala/resonantinduction/atomic/machine/thermometer/TileThermometer.scala index 6c2552bce..0886cf62e 100644 --- a/src/main/scala/resonantinduction/atomic/machine/thermometer/TileThermometer.scala +++ b/src/main/scala/resonantinduction/atomic/machine/thermometer/TileThermometer.scala @@ -96,7 +96,7 @@ class TileThermometer extends TileAdvanced(Material.piston) with SimpleComponent override def onRemove(block: Block, par6: Int) { - val stack: ItemStack = ItemBlockSaved.getItemStackWithNBT(getBlockType, world, x, y, z) + val stack: ItemStack = ItemBlockSaved.getItemStackWithNBT(getBlockType, world, xi, yi, zi) InventoryUtility.dropItemStack(world, center, stack) } @@ -113,14 +113,14 @@ class TileThermometer extends TileAdvanced(Material.piston) with SimpleComponent } else { - detectedTemperature = ThermalGrid.getTemperature(new VectorWorld(this)) + detectedTemperature = ThermalGrid.getTemperature(asVectorWorld) } if (detectedTemperature != previousDetectedTemperature || isProvidingPower != this.isOverThreshold) { previousDetectedTemperature = detectedTemperature isProvidingPower = isOverThreshold notifyChange - sendPacket(getDescPacket) + //sendPacket(getDescPacket) } } } diff --git a/src/main/scala/resonantinduction/core/prefab/node/TileTankNode.scala b/src/main/scala/resonantinduction/core/prefab/node/TileTankNode.scala index aead9d1b8..2ced3aa18 100644 --- a/src/main/scala/resonantinduction/core/prefab/node/TileTankNode.scala +++ b/src/main/scala/resonantinduction/core/prefab/node/TileTankNode.scala @@ -9,7 +9,7 @@ import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.fluids._ import resonant.content.prefab.java.TileAdvanced import resonant.lib.network.discriminator.{PacketTile, PacketType} -import resonant.lib.network.handle.IPacketIDReceiver +import resonant.lib.network.handle.TPacketIDReceiver import universalelectricity.api.core.grid.{INode, INodeProvider} /** @@ -17,7 +17,7 @@ import universalelectricity.api.core.grid.{INode, INodeProvider} * * @author DarkGuardsman */ -class TileTankNode(material: Material) extends TileAdvanced(material) with INodeProvider with IFluidHandler with IPacketIDReceiver +class TileTankNode(material: Material) extends TileAdvanced(material) with INodeProvider with IFluidHandler with TPacketIDReceiver { val PACKET_DESCRIPTION = 0 val PACKET_RENDER = 1 diff --git a/src/main/scala/resonantinduction/electrical/battery/TileBattery.scala b/src/main/scala/resonantinduction/electrical/battery/TileBattery.scala index a7361ccc5..e8484c728 100644 --- a/src/main/scala/resonantinduction/electrical/battery/TileBattery.scala +++ b/src/main/scala/resonantinduction/electrical/battery/TileBattery.scala @@ -111,7 +111,7 @@ class TileBattery extends TileElectric(Material.iron) with IPacketReceiver { energy.setCapacity(TileBattery.getEnergyForTier(ItemBlockBattery.getTier(itemStack))) energy.setEnergy((itemStack.getItem.asInstanceOf[ItemBlockBattery]).getEnergy(itemStack)) - world.setBlockMetadataWithNotify(x, y, z, ItemBlockBattery.getTier(itemStack), 3) + world.setBlockMetadataWithNotify(xi, yi, zi, ItemBlockBattery.getTier(itemStack), 3) } } @@ -120,7 +120,7 @@ class TileBattery extends TileElectric(Material.iron) with IPacketReceiver val ret: ArrayList[ItemStack] = new ArrayList[ItemStack] val itemStack: ItemStack = new ItemStack(getBlockType, 1) val itemBlock: ItemBlockBattery = itemStack.getItem.asInstanceOf[ItemBlockBattery] - ItemBlockBattery.setTier(itemStack, world.getBlockMetadata(x, y, z).asInstanceOf[Byte]) + ItemBlockBattery.setTier(itemStack, world.getBlockMetadata(xi, yi, zi).asInstanceOf[Byte]) itemBlock.setEnergy(itemStack, energy.getEnergy) ret.add(itemStack) return ret diff --git a/src/main/scala/resonantinduction/electrical/generator/TileThermopile.scala b/src/main/scala/resonantinduction/electrical/generator/TileThermopile.scala index 5c0186895..cebc207c7 100644 --- a/src/main/scala/resonantinduction/electrical/generator/TileThermopile.scala +++ b/src/main/scala/resonantinduction/electrical/generator/TileThermopile.scala @@ -23,7 +23,7 @@ class TileThermopile extends TileElectric(Material.rock) { var heatSources: Int = 0 var coolingSources: Int = 0 for (dir <- ForgeDirection.VALID_DIRECTIONS) { - val checkPos: Vector3 = new Vector3(this).add(dir) + val checkPos: Vector3 = asVector3.add(dir) val block: Block = checkPos.getBlock(worldObj) if (block eq Blocks.water) { coolingSources += 1 @@ -48,7 +48,7 @@ class TileThermopile extends TileElectric(Material.rock) { usingTicks += 1; usingTicks }) >= MAX_USE_TICKS) { for (dir <- ForgeDirection.VALID_DIRECTIONS) { - val checkPos: Vector3 = new Vector3(this).add(dir) + val checkPos: Vector3 = asVector3.add(dir) val blockID: Block = checkPos.getBlock(worldObj) if (blockID eq Blocks.water) { checkPos.setBlockToAir(worldObj) diff --git a/src/main/scala/resonantinduction/electrical/laser/emitter/TileLaserEmitter.scala b/src/main/scala/resonantinduction/electrical/laser/emitter/TileLaserEmitter.scala index 62c83c7ec..73c34c990 100644 --- a/src/main/scala/resonantinduction/electrical/laser/emitter/TileLaserEmitter.scala +++ b/src/main/scala/resonantinduction/electrical/laser/emitter/TileLaserEmitter.scala @@ -19,12 +19,12 @@ class TileLaserEmitter extends TileAdvanced(Material.iron) with ILaserHandler { if (isIndirectlyPowered) { - energy += world.getStrongestIndirectPower(x, y, z) * (Laser.maxEnergy / 15) + energy += world.getStrongestIndirectPower(xi, yi, zi) * (Laser.maxEnergy / 15) } if (energy > 0) { - Laser.spawn(worldObj, position + 0.5 + new Vector3(getDirection) * 0.51, position + new Vector3(getDirection) * 0.6 + 0.5, new Vector3(getDirection), energy) + Laser.spawn(worldObj, asVector3 + 0.5 + new Vector3(getDirection) * 0.51, asVector3 + new Vector3(getDirection) * 0.6 + 0.5, new Vector3(getDirection), energy) energy = 0; } } diff --git a/src/main/scala/resonantinduction/electrical/laser/focus/crystal/TileFocusCrystal.scala b/src/main/scala/resonantinduction/electrical/laser/focus/crystal/TileFocusCrystal.scala index d39470816..638745199 100644 --- a/src/main/scala/resonantinduction/electrical/laser/focus/crystal/TileFocusCrystal.scala +++ b/src/main/scala/resonantinduction/electrical/laser/focus/crystal/TileFocusCrystal.scala @@ -30,7 +30,7 @@ class TileFocusCrystal extends TileBase with ILaserHandler with IFocus { val dir = ForgeDirection.getOrientation(a) val axis = new Vector3(dir) - val rotateAngle = world.getIndirectPowerLevelTo(x + axis.x.toInt, y + axis.y.toInt, z + axis.z.toInt, a) * 15 + val rotateAngle = world.getIndirectPowerLevelTo(xi + axis.x.toInt, yi + axis.y.toInt, zi + axis.z.toInt, a) * 15 if (rotateAngle > 0) { @@ -38,12 +38,12 @@ class TileFocusCrystal extends TileBase with ILaserHandler with IFocus } } - world.markBlockForUpdate(x, y, z) + world.markBlockForUpdate(xi, yi, zi) } if (energy > 0) { - Laser.spawn(worldObj, position + 0.5 + normal * 0.9, position + 0.5, normal, color, energy) + Laser.spawn(worldObj, asVector3 + 0.5 + normal * 0.9, asVector3 + 0.5, normal, color, energy) color = new Vector3(1, 1, 1) energy = 0; } @@ -51,8 +51,8 @@ class TileFocusCrystal extends TileBase with ILaserHandler with IFocus override def focus(newPosition: Vector3) { - normal = ((newPosition - position) - 0.5).normalize - world.markBlockForUpdate(x, y, z) + normal = ((newPosition - asVector3) - 0.5).normalize + world.markBlockForUpdate(xi, yi, zi) } def setFocus(focus: Vector3) @@ -66,7 +66,7 @@ class TileFocusCrystal extends TileBase with ILaserHandler with IFocus override def onLaserHit(renderStart: Vector3, incidentDirection: Vector3, hit: MovingObjectPosition, color: Vector3, energy: Double): Boolean = { - ResonantInduction.proxy.renderLaser(worldObj, renderStart, position + 0.5, color, energy) + ResonantInduction.proxy.renderLaser(worldObj, renderStart, asVector3 + 0.5, color, energy) this.energy += energy this.color = (this.color + color) / 2 return true @@ -76,7 +76,7 @@ class TileFocusCrystal extends TileBase with ILaserHandler with IFocus { val nbt = new NBTTagCompound() writeToNBT(nbt) - return new S35PacketUpdateTileEntity(x, y, z, 0, nbt) + return new S35PacketUpdateTileEntity(xi, yi, zi, 0, nbt) } override def onDataPacket(net: NetworkManager, pkt: S35PacketUpdateTileEntity) diff --git a/src/main/scala/resonantinduction/electrical/laser/focus/mirror/TileMirror.scala b/src/main/scala/resonantinduction/electrical/laser/focus/mirror/TileMirror.scala index 5ae23fe7f..172f6b303 100644 --- a/src/main/scala/resonantinduction/electrical/laser/focus/mirror/TileMirror.scala +++ b/src/main/scala/resonantinduction/electrical/laser/focus/mirror/TileMirror.scala @@ -30,7 +30,7 @@ class TileMirror extends TileBase with ILaserHandler with IFocus { val dir = ForgeDirection.getOrientation(a) val axis = new Vector3(dir) - val rotateAngle = world.getIndirectPowerLevelTo(x + axis.x.toInt, y + axis.y.toInt, z + axis.z.toInt, a) * 15 + val rotateAngle = world.getIndirectPowerLevelTo(xi + axis.x.toInt, yi + axis.y.toInt, zi + axis.z.toInt, a) * 15 if (rotateAngle > 0) { @@ -38,7 +38,7 @@ class TileMirror extends TileBase with ILaserHandler with IFocus } } - world.markBlockForUpdate(x, y, z) + world.markBlockForUpdate(xi, yi, zi) } if (world.getTotalWorldTime % 20 == 0) @@ -47,8 +47,8 @@ class TileMirror extends TileBase with ILaserHandler with IFocus override def focus(newPosition: Vector3) { - normal = ((newPosition - position) - 0.5).normalize - world.markBlockForUpdate(x, y, z) + normal = ((newPosition - asVector3) - 0.5).normalize + world.markBlockForUpdate(xi, yi, zi) } def setFocus(focus: Vector3) @@ -70,7 +70,7 @@ class TileMirror extends TileBase with ILaserHandler with IFocus /** * Render incoming laser */ - ResonantInduction.proxy.renderLaser(worldObj, renderStart, position + 0.5, color, energy) + ResonantInduction.proxy.renderLaser(worldObj, renderStart, asVector3 + 0.5, color, energy) /** * Calculate Reflection @@ -82,7 +82,7 @@ class TileMirror extends TileBase with ILaserHandler with IFocus if (Math.toDegrees(rotateAngle) < 180) { val newDirection = (incidentDirection.clone.transform(new Quaternion(rotateAngle, axisOfReflection))).normalize - Laser.spawn(worldObj, position + 0.5 + newDirection * 0.9, position + 0.5, newDirection, color, energy / 1.2) + Laser.spawn(worldObj, asVector3 + 0.5 + newDirection * 0.9, asVector3 + 0.5, newDirection, color, energy / 1.2) } return true @@ -92,7 +92,7 @@ class TileMirror extends TileBase with ILaserHandler with IFocus { val nbt = new NBTTagCompound() writeToNBT(nbt) - return new S35PacketUpdateTileEntity(x, y, z, 0, nbt) + return new S35PacketUpdateTileEntity(xi, yi, zi, 0, nbt) } override def onDataPacket(net: NetworkManager, pkt: S35PacketUpdateTileEntity) diff --git a/src/main/scala/resonantinduction/electrical/laser/receiver/TileLaserReceiver.scala b/src/main/scala/resonantinduction/electrical/laser/receiver/TileLaserReceiver.scala index e2fb3349c..d2d963723 100644 --- a/src/main/scala/resonantinduction/electrical/laser/receiver/TileLaserReceiver.scala +++ b/src/main/scala/resonantinduction/electrical/laser/receiver/TileLaserReceiver.scala @@ -23,8 +23,8 @@ class TileLaserReceiver extends TileBase with ILaserHandler if (redstoneValue != prevRedstoneValue) { - world.notifyBlocksOfNeighborChange(x, y, z, getBlockType) - ForgeDirection.VALID_DIRECTIONS.foreach(dir => world.notifyBlocksOfNeighborChange(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, getBlockType)) + world.notifyBlocksOfNeighborChange(xi, yi, zi, getBlockType) + ForgeDirection.VALID_DIRECTIONS.foreach(dir => world.notifyBlocksOfNeighborChange(xi + dir.offsetX, yi + dir.offsetY, zi + dir.offsetZ, getBlockType)) prevRedstoneValue = redstoneValue } @@ -36,8 +36,8 @@ class TileLaserReceiver extends TileBase with ILaserHandler if (redstoneValue != prevRedstoneValue) { - world.notifyBlocksOfNeighborChange(x, y, z, getBlockType) - ForgeDirection.VALID_DIRECTIONS.foreach(dir => world.notifyBlocksOfNeighborChange(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, getBlockType)) + world.notifyBlocksOfNeighborChange(xi, yi, zi, getBlockType) + ForgeDirection.VALID_DIRECTIONS.foreach(dir => world.notifyBlocksOfNeighborChange(xi + dir.offsetX, yi + dir.offsetY, zi + dir.offsetZ, getBlockType)) prevRedstoneValue = redstoneValue } } diff --git a/src/main/scala/resonantinduction/electrical/tesla/TileTesla.scala b/src/main/scala/resonantinduction/electrical/tesla/TileTesla.scala index 5d8ebf89a..04cc22ec9 100644 --- a/src/main/scala/resonantinduction/electrical/tesla/TileTesla.scala +++ b/src/main/scala/resonantinduction/electrical/tesla/TileTesla.scala @@ -21,12 +21,13 @@ import net.minecraftforge.common.util.ForgeDirection import resonant.lib.content.prefab.java.TileElectric import resonant.lib.multiblock.reference.{IMultiBlockStructure, MultiBlockHandler} import resonant.lib.network.discriminator.{PacketTile, PacketType} -import resonant.lib.network.handle.IPacketReceiver +import resonant.lib.network.handle.TPacketIDReceiver import resonant.lib.render.EnumColor import resonant.lib.utility.{LanguageUtility, LinkUtility} import resonantinduction.core.util.ResonantUtil -import resonantinduction.core.{ResonantInduction, Reference, Settings} +import resonantinduction.core.{Reference, ResonantInduction, Settings} import universalelectricity.core.transform.vector.{Vector3, VectorWorld} + import scala.collection.JavaConversions._ /** @@ -42,7 +43,7 @@ object TileTesla final val DEFAULT_COLOR: Int = 12 } -class TileTesla extends TileElectric(Material.iron) with IMultiBlockStructure[TileTesla] with ITesla with IPacketReceiver +class TileTesla extends TileElectric(Material.iron) with IMultiBlockStructure[TileTesla] with ITesla with TPacketIDReceiver { final val TRANSFER_CAP: Double = 10000D @@ -92,7 +93,7 @@ class TileTesla extends TileElectric(Material.iron) with IMultiBlockStructure[Ti if (this.ticks % (4 + this.worldObj.rand.nextInt(2)) == 0 && ((this.worldObj.isRemote && isTransfering) || (!this.energy.isEmpty && !this.worldObj.isBlockIndirectlyGettingPowered(this.xCoord, this.yCoord, this.zCoord)))) { val topTesla: TileTesla = this.getTopTelsa - val topTeslaVector: Vector3 = new Vector3(topTesla) + val topTeslaVector: Vector3 = asVector3 if (this.linked != null || this.isLinkedClient) { if (!this.worldObj.isRemote) @@ -122,8 +123,8 @@ class TileTesla extends TileElectric(Material.iron) with IMultiBlockStructure[Ti { def compare(o1: ITesla, o2: ITesla): Int = { - val distance1: Double = new Vector3(topTesla).distance(new Vector3(o1.asInstanceOf[TileEntity])) - val distance2: Double = new Vector3(topTesla).distance(new Vector3(o2.asInstanceOf[TileEntity])) + val distance1: Double = asVector3.distance(new Vector3(o1.asInstanceOf[TileEntity])) + val distance2: Double = asVector3.distance(new Vector3(o2.asInstanceOf[TileEntity])) if (distance1 < distance2) { return 1 @@ -139,7 +140,7 @@ class TileTesla extends TileElectric(Material.iron) with IMultiBlockStructure[Ti for (o <- TeslaGrid.instance.get) { var otherTesla = o - if (new Vector3(otherTesla.asInstanceOf[TileEntity]).distance(new Vector3(this)) < this.getRange && otherTesla != this) + if (new Vector3(otherTesla.asInstanceOf[TileEntity]).distance(asVector3) < this.getRange && otherTesla != this) { if (otherTesla.isInstanceOf[TileTesla]) { @@ -170,11 +171,11 @@ class TileTesla extends TileElectric(Material.iron) with IMultiBlockStructure[Ti if (tesla.isInstanceOf[TileTesla]) { getMultiBlock.get.outputBlacklist.add(this) - targetVector = new Vector3((tesla.asInstanceOf[TileTesla]).getTopTelsa) + targetVector = tesla.asInstanceOf[TileTesla].getTopTelsa.asVector3 heightRange = (tesla.asInstanceOf[TileTesla]).getHeight } val distance: Double = topTeslaVector.distance(targetVector) - ResonantInduction.proxy.renderElectricShock(this.worldObj, new Vector3(topTesla).add(new Vector3(0.5)), targetVector.add(new Vector3(0.5, Math.random * heightRange / 3 - heightRange / 3, 0.5)), EnumColor.DYES(this.dyeID).toColor) + ResonantInduction.proxy.renderElectricShock(this.worldObj, topTesla.asVector3.add(new Vector3(0.5)), targetVector.add(new Vector3(0.5, Math.random * heightRange / 3 - heightRange / 3, 0.5)), EnumColor.DYES(this.dyeID).toColor) this.transfer(tesla, Math.min(transferEnergy, TRANSFER_CAP)) if (!sentPacket && transferEnergy > 0) { @@ -219,9 +220,9 @@ class TileTesla extends TileElectric(Material.iron) with IMultiBlockStructure[Ti return canReceive && tileEntity != getMultiBlock.get && !this.outputBlacklist.contains(tileEntity) } - def sendPacket(`type`: Int) + def sendPacket(id: Int) { - sendPacket(new PacketTile(this, this.getPacketData(`type`).toArray)) + super.sendPacket(new PacketTile(xi, yi, zi, this.getPacketData(id).toArray)) } override def getDescPacket: PacketTile = @@ -255,35 +256,28 @@ class TileTesla extends TileElectric(Material.iron) with IMultiBlockStructure[Ti return data } - def read(data: ByteBuf, player: EntityPlayer, `type`: PacketType) + override def read(data: ByteBuf, id: Int, player: EntityPlayer, `type`: PacketType) : Boolean = { - try + if (id == 1) { - var id: Int = data.readByte - if (id == 1) - { - this.dyeID = data.readInt - this.canReceive = data.readBoolean - this.attackEntities = data.readBoolean - this.isLinkedClient = data.readBoolean - getMultiBlock.load(ByteBufUtils.readTag(data)) - } - if (id == 2) - { - this.isTransfering = data.readBoolean - } - if (id == 3) - { - this.doTransfer = true - } + this.dyeID = data.readInt + this.canReceive = data.readBoolean + this.attackEntities = data.readBoolean + this.isLinkedClient = data.readBoolean + getMultiBlock.load(ByteBufUtils.readTag(data)) + return true + }else + if (id == 2) + { + this.isTransfering = data.readBoolean + return true + }else + if (id == 3) + { + this.doTransfer = true + return true } - catch - { - case e: Exception => - { - e.printStackTrace - } - } + return false } def teslaTransfer(e: Double, doTransfer: Boolean): Double = @@ -322,8 +316,8 @@ class TileTesla extends TileElectric(Material.iron) with IMultiBlockStructure[Ti val mainTile: TileTesla = getLowestTesla mainTile.getMultiBlock.deconstruct mainTile.getMultiBlock.construct - val isTop: Boolean = new Vector3(this).add(new Vector3(0, 1, 0)).getTileEntity(this.worldObj).isInstanceOf[TileTesla] - val isBottom: Boolean = new Vector3(this).add(new Vector3(0, -1, 0)).getTileEntity(this.worldObj).isInstanceOf[TileTesla] + val isTop: Boolean = asVector3.add(new Vector3(0, 1, 0)).getTileEntity(this.worldObj).isInstanceOf[TileTesla] + val isBottom: Boolean = asVector3.add(new Vector3(0, -1, 0)).getTileEntity(this.worldObj).isInstanceOf[TileTesla] if (isTop && isBottom) { this.worldObj.setBlockMetadataWithNotify(this.xCoord, this.yCoord, this.zCoord, 1, 3) @@ -350,7 +344,7 @@ class TileTesla extends TileElectric(Material.iron) with IMultiBlockStructure[Ti return this.topCache } this.connectedTeslas.clear - val checkPosition: Vector3 = new Vector3(this) + val checkPosition: Vector3 = asVector3 var returnTile: TileTesla = this var exit = false while (exit) @@ -386,7 +380,7 @@ class TileTesla extends TileElectric(Material.iron) with IMultiBlockStructure[Ti var exit = false while (!exit) { - val t: TileEntity = new Vector3(this).add(new Vector3(0, y, 0)).getTileEntity(this.worldObj) + val t: TileEntity = asVector3.add(new Vector3(0, y, 0)).getTileEntity(this.worldObj) if (t.isInstanceOf[TileTesla]) { this.connectedTeslas.add(t.asInstanceOf[TileTesla]) @@ -484,7 +478,7 @@ class TileTesla extends TileElectric(Material.iron) with IMultiBlockStructure[Ti val tileEntity: TileEntity = this.linked.getTileEntity(newOtherWorld) if (tileEntity.isInstanceOf[TileTesla]) { - (tileEntity.asInstanceOf[TileTesla]).setLink(new Vector3(this), this.worldObj.provider.dimensionId, false) + (tileEntity.asInstanceOf[TileTesla]).setLink(asVector3, this.worldObj.provider.dimensionId, false) } } } @@ -510,7 +504,7 @@ class TileTesla extends TileElectric(Material.iron) with IMultiBlockStructure[Ti def getMultiBlockVectors: java.lang.Iterable[Vector3] = { val vectors: List[Vector3] = new ArrayList[Vector3] - val checkPosition: Vector3 = new Vector3(this) + val checkPosition: Vector3 = asVector3 var exit = false while (!exit) { @@ -531,7 +525,7 @@ class TileTesla extends TileElectric(Material.iron) with IMultiBlockStructure[Ti def getLowestTesla: TileTesla = { var lowest: TileTesla = this - val checkPosition: Vector3 = new Vector3(this) + val checkPosition: Vector3 = asVector3 var exit = false while (!exit) { @@ -556,7 +550,7 @@ class TileTesla extends TileElectric(Material.iron) with IMultiBlockStructure[Ti def getPosition: Vector3 = { - return new Vector3(this) + return asVector3 } def getMultiBlock: MultiBlockHandler[TileTesla] = @@ -639,7 +633,7 @@ class TileTesla extends TileElectric(Material.iron) with IMultiBlockStructure[Ti else { if (world.isRemote) player.addChatMessage(new ChatComponentText("Marked link for device.")) - LinkUtility.setLink(itemStack, new VectorWorld(this)) + LinkUtility.setLink(itemStack, asVectorWorld) } return true } diff --git a/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.scala b/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.scala index 47c7916ac..2fb44ee29 100644 --- a/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.scala +++ b/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.scala @@ -7,7 +7,6 @@ import net.minecraftforge.fluids.{Fluid, FluidStack, FluidTankInfo, IFluidHandle import resonant.api.IRotatable import resonantinduction.mechanical.mech.TileMechanical import universalelectricity.api.core.grid.INode -import universalelectricity.core.transform.vector.Vector3 class TilePump extends TileMechanical(Material.iron) with IRotatable with IFluidHandler { @@ -38,7 +37,7 @@ class TilePump extends TileMechanical(Material.iron) with IRotatable with IFluid super.update if (!worldObj.isRemote && mechanicalNode.getPower > 0) { - val tileIn: TileEntity = new Vector3(this).add(getDirection.getOpposite).getTileEntity(this.worldObj) + val tileIn: TileEntity = asVector3.add(getDirection.getOpposite).getTileEntity(this.worldObj) if (tileIn.isInstanceOf[IFluidHandler]) { val drain: FluidStack = (tileIn.asInstanceOf[IFluidHandler]).drain(getDirection, pressureNode.getCapacity, false) @@ -54,7 +53,7 @@ class TilePump extends TileMechanical(Material.iron) with IRotatable with IFluid { if (from eq getDirection.getOpposite) { - val tileOut: TileEntity = new Vector3(this).add(from.getOpposite).getTileEntity(this.worldObj) + val tileOut: TileEntity = asVector3.add(from.getOpposite).getTileEntity(this.worldObj) if (tileOut.isInstanceOf[IFluidHandler]) return (tileOut.asInstanceOf[IFluidHandler]).fill(from, resource, doFill) } return 0 diff --git a/src/main/scala/resonantinduction/mechanical/machine/TileDetector.scala b/src/main/scala/resonantinduction/mechanical/machine/TileDetector.scala index 632ac2f69..349e15ff6 100644 --- a/src/main/scala/resonantinduction/mechanical/machine/TileDetector.scala +++ b/src/main/scala/resonantinduction/mechanical/machine/TileDetector.scala @@ -84,7 +84,7 @@ class TileDetector extends TileFilterable with IPacketIDReceiver this.worldObj.notifyBlocksOfNeighborChange(x, this.yCoord + 1, z, MechanicalContent.blockDetector) } } - ResonantEngine.instance.packetHandler.sendToAllAround(new PacketTile(x, y, z, Array[Any](0, this.isInverted)), this) + ResonantEngine.instance.packetHandler.sendToAllAround(new PacketTile(xi, yi, zi, Array[Any](0, this.isInverted)), this) } } } @@ -110,7 +110,7 @@ class TileDetector extends TileFilterable with IPacketIDReceiver override def getDescriptionPacket: Packet = { - return ResonantEngine.instance.packetHandler.toMCPacket(new PacketTile(x, y, z, Array[Any](0, this.isInverted))) + return ResonantEngine.instance.packetHandler.toMCPacket(new PacketTile(xi, yi, zi, Array[Any](0, this.isInverted))) } override def read(data: ByteBuf, id: Int, player: EntityPlayer, `type`: PacketType): Boolean = @@ -140,7 +140,7 @@ class TileDetector extends TileFilterable with IPacketIDReceiver { var isInverted: Boolean = false var isFront: Boolean = false - val tileEntity: TileEntity = iBlockAccess.getTileEntity(x, y, z) + val tileEntity: TileEntity = iBlockAccess.getTileEntity(xi, yi, zi) if (tileEntity.isInstanceOf[TileDetector]) { isFront = side == (tileEntity.asInstanceOf[TileDetector]).getDirection.ordinal diff --git a/src/main/scala/resonantinduction/mechanical/machine/edit/TileBreaker.scala b/src/main/scala/resonantinduction/mechanical/machine/edit/TileBreaker.scala index 9db529d82..3533f55aa 100644 --- a/src/main/scala/resonantinduction/mechanical/machine/edit/TileBreaker.scala +++ b/src/main/scala/resonantinduction/mechanical/machine/edit/TileBreaker.scala @@ -89,8 +89,8 @@ class TileBreaker extends TileAdvanced(Material.iron) with IRotatable with IPack if (isIndirectlyPowered) { val dir: ForgeDirection = getDirection - val check: Vector3 = position.add(dir) - val put: VectorWorld = position.add(dir.getOpposite).asInstanceOf[VectorWorld] + val check: Vector3 = asVector3.add(dir) + val put: VectorWorld = asVector3.add(dir.getOpposite).asInstanceOf[VectorWorld] val block: Block = check.getBlock(world) if (block != null) { @@ -123,7 +123,7 @@ class TileBreaker extends TileAdvanced(Material.iron) with IRotatable with IPack @SideOnly(Side.CLIENT) override def getIcon(access: IBlockAccess, side: Int): IIcon = { - val meta: Int = access.getBlockMetadata(x, y, z) + val meta: Int = access.getBlockMetadata(xi, yi, zi) if (side == meta) { return TileBreaker.iconFront diff --git a/src/main/scala/resonantinduction/mechanical/machine/edit/TilePlacer.scala b/src/main/scala/resonantinduction/mechanical/machine/edit/TilePlacer.scala index c6e824a57..068b49de2 100644 --- a/src/main/scala/resonantinduction/mechanical/machine/edit/TilePlacer.scala +++ b/src/main/scala/resonantinduction/mechanical/machine/edit/TilePlacer.scala @@ -2,9 +2,7 @@ package resonantinduction.mechanical.machine.edit import java.util.EnumSet -import cpw.mods.fml.common.network.ByteBufUtils import cpw.mods.fml.relauncher.{Side, SideOnly} -import io.netty.buffer.ByteBuf import net.minecraft.block.Block import net.minecraft.block.material.Material import net.minecraft.client.renderer.texture.IIconRegister @@ -17,8 +15,8 @@ import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11 import resonant.api.IRotatable import resonant.lib.content.prefab.java.TileInventory -import resonant.lib.network.discriminator.{PacketTile, PacketType} -import resonant.lib.network.handle.IPacketReceiver +import resonant.lib.network.discriminator.PacketTile +import resonant.lib.network.handle.TPacketReceiver import resonant.lib.render.RenderItemOverlayUtility import resonant.lib.utility.LanguageUtility import resonant.lib.utility.inventory.{InternalInventoryHandler, InventoryUtility} @@ -34,7 +32,7 @@ object TilePlacer @SideOnly(Side.CLIENT) private var iconBack: IIcon = null } -class TilePlacer extends TileInventory(Material.rock) with IRotatable with IPacketReceiver +class TilePlacer extends TileInventory(Material.rock) with IRotatable with TPacketReceiver { private var _doWork: Boolean = false private var autoPullItems: Boolean = false @@ -109,7 +107,7 @@ class TilePlacer extends TileInventory(Material.rock) with IRotatable with IPack def doWork { val side: Int = 0 - val placePos: Vector3 = position.add(getDirection) + val placePos: Vector3 = asVector3.add(getDirection) val placeStack: ItemStack = getStackInSlot(0) if (InventoryUtility.placeItemBlock(world, placePos.xi, placePos.yi, placePos.zi, placeStack, side)) { @@ -151,21 +149,6 @@ class TilePlacer extends TileInventory(Material.rock) with IRotatable with IPack sendPacket(getDescPacket) } - def read(data: ByteBuf, player: EntityPlayer, `type`: PacketType) - { - try - { - readFromNBT(ByteBufUtils.readTag(data)) - } - catch - { - case e: Exception => - { - e.printStackTrace - } - } - } - override def readFromNBT(nbt: NBTTagCompound) { super.readFromNBT(nbt) @@ -188,7 +171,7 @@ class TilePlacer extends TileInventory(Material.rock) with IRotatable with IPack @SideOnly(Side.CLIENT) override def getIcon(access: IBlockAccess, side: Int): IIcon = { - val meta: Int = access.getBlockMetadata(x, y, z) + val meta: Int = access.getBlockMetadata(xi, yi, zi) if (side == meta) { return TilePlacer.iconFront diff --git a/src/main/scala/resonantinduction/mechanical/mech/TileMechanical.scala b/src/main/scala/resonantinduction/mechanical/mech/TileMechanical.scala index 818582830..a1164f658 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/TileMechanical.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/TileMechanical.scala @@ -93,13 +93,13 @@ abstract class TileMechanical(material: Material) extends TileNode(material) wit { val tag: NBTTagCompound = new NBTTagCompound writeToNBT(tag) - return ResonantEngine.instance.packetHandler.toMCPacket(new PacketTile(x, y, z, Array(nbt_packet_id, tag))) + return ResonantEngine.instance.packetHandler.toMCPacket(new PacketTile(xi, yi, zi, Array(nbt_packet_id, tag))) } /** Sends the torque and angular velocity to the client */ private def sendRotationPacket { - ResonantEngine.instance.packetHandler.sendToAllAround(new PacketTile(x, y , z, Array(vel_packet_id, mechanicalNode.angularVelocity, mechanicalNode.torque)), this) + ResonantEngine.instance.packetHandler.sendToAllAround(new PacketTile(xi, yi , zi, Array(vel_packet_id, mechanicalNode.angularVelocity, mechanicalNode.torque)), this) } override def read(data: ByteBuf, id: Int, player: EntityPlayer, `type`: PacketType): Boolean = diff --git a/src/main/scala/resonantinduction/mechanical/mech/process/crusher/RenderMechanicalPiston.scala b/src/main/scala/resonantinduction/mechanical/mech/process/crusher/RenderMechanicalPiston.scala index 197971294..823df766c 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/process/crusher/RenderMechanicalPiston.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/process/crusher/RenderMechanicalPiston.scala @@ -46,7 +46,7 @@ import cpw.mods.fml.relauncher.SideOnly if (tile.getWorldObj != null) { val dir: ForgeDirection = tile.getDirection - if (tile.world.isAirBlock(tile.x + dir.offsetX, tile.y + dir.offsetY, tile.z + dir.offsetZ)) + if (tile.world.isAirBlock(tile.xi + dir.offsetX, tile.yi + dir.offsetY, tile.zi + dir.offsetZ)) { GL11.glTranslated(0, 0, (0.4 * Math.sin(angle)) - 0.5) } diff --git a/src/main/scala/resonantinduction/mechanical/mech/process/crusher/TileMechanicalPiston.scala b/src/main/scala/resonantinduction/mechanical/mech/process/crusher/TileMechanicalPiston.scala index d02044397..e6967d2ee 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/process/crusher/TileMechanicalPiston.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/process/crusher/TileMechanicalPiston.scala @@ -50,7 +50,7 @@ class TileMechanicalPiston extends TileMechanical(Material.piston) super.update if (markRevolve) { - val movePosition: Vector3 = new Vector3(TileMechanicalPiston.this).add(getDirection) + val movePosition: Vector3 = asVector3.add(getDirection) if (!hitOreBlock(movePosition)) { if (!worldObj.isRemote) diff --git a/src/main/scala/resonantinduction/mechanical/mech/process/grinder/TileGrindingWheel.scala b/src/main/scala/resonantinduction/mechanical/mech/process/grinder/TileGrindingWheel.scala index 7b4eee47d..2a52b9c0e 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/process/grinder/TileGrindingWheel.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/process/grinder/TileGrindingWheel.scala @@ -120,7 +120,7 @@ class TileGrindingWheel extends TileMechanical(Material.rock) with IRotatable var didWork: Boolean = false if (grindingItem != null) { - if (TileGrindingWheel.TIMER_GRIND_ITEM.containsKey(grindingItem) && !grindingItem.isDead && new Vector3(this).add(0.5).distance(new Vector3(grindingItem)) < 1) + if (TileGrindingWheel.TIMER_GRIND_ITEM.containsKey(grindingItem) && !grindingItem.isDead && asVector3.add(0.5).distance(new Vector3(grindingItem)) < 1) { val timeLeft: Int = TileGrindingWheel.TIMER_GRIND_ITEM.decrease(grindingItem) if (timeLeft <= 0) diff --git a/src/main/scala/resonantinduction/mechanical/mech/process/mixer/TileMixer.scala b/src/main/scala/resonantinduction/mechanical/mech/process/mixer/TileMixer.scala index 7c5f6fad7..ce6af32c0 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/process/mixer/TileMixer.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/process/mixer/TileMixer.scala @@ -70,7 +70,7 @@ class TileMixer extends TileMechanical(Material.iron) { if (x != 0 && z != 0) { - val block: Block = position.add(x, 0, z).getBlock(world) + val block: Block = asVector3.add(x, 0, z).getBlock(world) if (block != null && !(block.isInstanceOf[IFluidBlock])) { return true @@ -101,9 +101,9 @@ class TileMixer extends TileMechanical(Material.iron) { val entity: Entity = obj.asInstanceOf[Entity] val originalPosition: Vector3 = new Vector3(entity) - val relativePosition: Vector3 = originalPosition.clone.subtract(new Vector3(this).add(0.5)) + val relativePosition: Vector3 = originalPosition.clone.subtract(asVector3.add(0.5)) relativePosition.transform(new Quaternion(-mechanicalNode.getAngularSpeed(ForgeDirection.UNKNOWN), new Vector3(1, 0, 0))) - val newPosition: Vector3 = new Vector3(this).add(0.5).add(relativePosition) + val newPosition: Vector3 = asVector3.add(0.5).add(relativePosition) val difference: Vector3 = newPosition.subtract(originalPosition).multiply(0.5) entity.addVelocity(difference.x, difference.y, difference.z) entity.onGround = false @@ -122,7 +122,7 @@ class TileMixer extends TileMechanical(Material.iron) { TileMixer.MIXER_ITEM_TIMER.put(processingItem, TileMixer.PROCESS_TIME) } - if (!processingItem.isDead && new Vector3(this).add(0.5).distance(new Vector3(processingItem)) < 2) + if (!processingItem.isDead && asVector3.add(0.5).distance(new Vector3(processingItem)) < 2) { val timeLeft: Int = TileMixer.MIXER_ITEM_TIMER.decrease(processingItem) if (timeLeft <= 0) diff --git a/src/main/scala/resonantinduction/mechanical/mech/turbine/TileTurbine.scala b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileTurbine.scala index bd181ca36..966da1118 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/turbine/TileTurbine.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileTurbine.scala @@ -131,7 +131,7 @@ class TileTurbine extends TileMechanical(Material.wood) with IMultiBlockStructur def getPosition: Vector3 = { - return new Vector3(this) + return asVector3 } def getMultiBlock: TurbineMBlockHandler = diff --git a/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWaterTurbine.scala b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWaterTurbine.scala index 015db3558..65a7ce045 100644 --- a/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWaterTurbine.scala +++ b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileWaterTurbine.scala @@ -91,7 +91,7 @@ class TileWaterTurbine extends TileTurbine { if (dir != currentDir && dir != currentDir.getOpposite) { - val check: Vector3 = new Vector3(this).add(dir) + val check: Vector3 = asVector3.add(dir) val blockID: Block = worldObj.getBlock(check.xi, check.yi, check.zi) val metadata: Int = worldObj.getBlockMetadata(check.xi, check.yi, check.zi) if (blockID == Blocks.water || blockID == Blocks.flowing_water)