tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

More error removal

Browse source
This commit is contained in:
Robert S 2014-07-29 03:56:07 -04:00
parent 9f36676ef7
commit cc9886c126
5 changed files with 70 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/main/scala/resonantinduction/atomic/machine/reactor/TileReactorCell.scala
View file

@ -4,22 +4,17 @@ import java.util.ArrayList
import java.util.List
import net.minecraft.block.material.Material
import net.minecraft.init.Blocks
import resonant.content.spatial.block.SpatialBlock
import resonant.api.event.PlasmaEvent
import resonant.engine.grid.thermal.{ThermalGrid, ThermalPhysics}
import resonant.lib.content.prefab.TInventory
import resonant.lib.content.prefab.java.TileInventory
import resonant.lib.multiblock.reference.{MultiBlockHandler, IMultiBlockStructure}
import resonant.lib.network.discriminator.PacketAnnotation
import resonant.lib.network.netty.PacketManager
import resonantinduction.atomic.Atomic
import resonantinduction.atomic.ReactorExplosion
import resonantinduction.atomic.machine.plasma.TilePlasma
import net.minecraft.block.Block
import net.minecraft.entity.EntityLiving
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.inventory.IInventory
import net.minecraft.inventory.ISidedInventory
import net.minecraft.item.ItemStack
import net.minecraft.nbt.NBTTagCompound
import net.minecraft.network.packet.Packet
import net.minecraft.tileentity.TileEntity
import net.minecraft.util.AxisAlignedBB
import net.minecraft.world.World
@ -33,29 +28,20 @@ import net.minecraftforge.fluids.FluidTankInfo
import net.minecraftforge.fluids.IFluidHandler
import resonant.api.IReactor
import resonant.api.IReactorComponent
import resonant.api.event.PlasmaEvent.SpawnPlasmaEvent
import resonant.lib.content.module.prefab.TileInventory
import resonant.lib.multiblock.IMultiBlockStructure
import resonant.lib.multiblock.MultiBlockHandler
import resonant.lib.network.PacketHandler
import resonant.lib.network.Synced
import resonant.lib.network.Synced.SyncedInput
import resonant.lib.network.Synced.SyncedOutput
import resonant.lib.prefab.poison.PoisonRadiation
import resonant.lib.thermal.ThermalGrid
import resonant.lib.thermal.ThermalPhysics
import resonant.lib.utility.inventory.InventoryUtility
import resonantinduction.atomic.Atomic
import resonantinduction.atomic.ReactorExplosion
import resonantinduction.atomic.machine.plasma.TilePlasma
import resonantinduction.core.Reference
import resonantinduction.core.ResonantInduction
import universalelectricity.api.UniversalElectricity
import universalelectricity.core.UniversalElectricity
import universalelectricity.core.transform.vector.{VectorWorld, Vector3}
import universalelectricity.api.vector.VectorWorld
import cpw.mods.fml.relauncher.Side
import cpw.mods.fml.relauncher.SideOnly
import scala.util.control.Breaks._
/** The primary reactor component cell used to build reactors with.
*
@ -65,7 +51,7 @@ object TileReactorCell {
final val MELTING_POINT: Int = 2000
}
class TileReactorCell extends SpatialBlock(Material.iron) with TInventory with IMultiBlockStructure[TileReactorCell] with IReactor with IFluidHandler {
class TileReactorCell extends TileInventory(Material.iron) with IMultiBlockStructure[TileReactorCell] with IReactor with IFluidHandler {
private final val specificHeatCapacity: Int = 1000
private final val mass: Float = ThermalPhysics.getMass(1000, 7)
@ -142,11 +128,11 @@ class TileReactorCell extends SpatialBlock(Material.iron) with TInventory with I
}
}
if (!getWorld.isRemote) {
if (getMultiBlock.isPrimary && tank.getFluid != null && tank.getFluid.fluidID == Atomic.FLUID_PLASMA.getID) {
if (getMultiBlock().isPrimary() && tank.getFluid != null && tank.getFluid.fluidID == Atomic.FLUID_PLASMA.getID) {
val drain: FluidStack = tank.drain(FluidContainerRegistry.BUCKET_VOLUME, false)
if (drain != null && drain.amount >= FluidContainerRegistry.BUCKET_VOLUME) {
val spawnDir: ForgeDirection = ForgeDirection.getOrientation(worldObj.rand.nextInt(3) + 2)
val spawnPos: Vector3 = new Vector3(this).add(spawnDir, 2)
val spawnPos: Vector3 = new Vector3(this) + spawnDir + spawnDir
spawnPos.add(0, Math.max(worldObj.rand.nextInt(getHeight) - 1, 0), 0)
if (worldObj.isAirBlock(spawnPos.xi, spawnPos.yi, spawnPos.zi)) {
MinecraftForge.EVENT_BUS.post(new PlasmaEvent.SpawnPlasmaEvent(worldObj, spawnPos.xi, spawnPos.yi, spawnPos.zi, TilePlasma.plasmaMaxTemperature))
@ -165,10 +151,9 @@ class TileReactorCell extends SpatialBlock(Material.iron) with TInventory with I
getMultiBlock.get.setInventorySlotContents(0, null)
}
}
if (ticks % 20 eq 0) {
if (ticks % 20 == 0) {
if (worldObj.rand.nextFloat > 0.65) {
val entities: List[EntityLiving] = worldObj.getEntitiesWithinAABB(classOf[EntityLiving], AxisAlignedBB.getBoundingBox(xCoord - RADIUS * 2, yCoord - RADIUS * 2, zCoord - RADIUS * 2, xCoord + RADIUS * 2, yCoord + RADIUS * 2, zCoord + RADIUS * 2))
import scala.collection.JavaConversions._
val entities: List[_] = 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))
for (entity <- entities) {
PoisonRadiation.INSTANCE.poisonEntity(new Vector3(this), entity)
}
@ -241,7 +226,7 @@ class TileReactorCell extends SpatialBlock(Material.iron) with TInventory with I
}
}
else {
if (worldObj.rand.nextInt(5) eq 0 && this.getTemperature >= 373) {
if (worldObj.rand.nextInt(5) == 0 && this.getTemperature >= 373) {
worldObj.spawnParticle("cloud", this.xCoord + worldObj.rand.nextInt(2), this.yCoord + 1.0F, this.zCoord + worldObj.rand.nextInt(2), 0, 0.1D, 0)
worldObj.spawnParticle("bubble", this.xCoord + worldObj.rand.nextInt(5), this.yCoord, this.zCoord + worldObj.rand.nextInt(5), 0, 0, 0)
}
@ -313,7 +298,7 @@ class TileReactorCell extends SpatialBlock(Material.iron) with TInventory with I
return new Vector3(this)
}
def getMultiBlock: IMultiBlockStructure[TileReactorCell] = {
override def getMultiBlock: MultiBlockHandler[TileReactorCell] = {
if (multiBlock == null) {
multiBlock = new MultiBlockHandler[TileReactorCell](this)
}
@ -332,13 +317,13 @@ class TileReactorCell extends SpatialBlock(Material.iron) with TInventory with I
return height
}
def getDescriptionPacket: Nothing = {
return ResonantInduction.PACKET_ANNOTATION.getPacket(this)
override def getDescriptionPacket: Any = {
return new PacketAnnotation(this)
}
private def meltDown {
if (!worldObj.isRemote) {
this.worldObj.setBlock(Block.lavaStill.blockID, 0, this.xCoord, this.yCoord, this.zCoord, 3)
this.worldObj.setBlock(this.xCoord, this.yCoord, this.zCoord, Blocks.lava)
val reactorExplosion: ReactorExplosion = new ReactorExplosion(worldObj, null, xCoord, yCoord, zCoord, 9f)
reactorExplosion.doExplosionA
reactorExplosion.doExplosionB(true)
@ -346,7 +331,7 @@ class TileReactorCell extends SpatialBlock(Material.iron) with TInventory with I
}
/** Reads a tile entity from NBT. */
@SyncedInput def readFromNBT(nbt: NBTTagCompound) {
@SyncedInput override def readFromNBT(nbt: NBTTagCompound) {
super.readFromNBT(nbt)
temperature = nbt.getFloat("temperature")
tank.readFromNBT(nbt)
@ -354,7 +339,7 @@ class TileReactorCell extends SpatialBlock(Material.iron) with TInventory with I
}
/** Writes a tile entity to NBT. */
@SyncedOutput def writeToNBT(nbt: NBTTagCompound) {
@SyncedOutput override def writeToNBT(nbt: NBTTagCompound) {
super.writeToNBT(nbt)
nbt.setFloat("temperature", temperature)
tank.writeToNBT(nbt)
@ -415,7 +400,7 @@ class TileReactorCell extends SpatialBlock(Material.iron) with TInventory with I
}
@SideOnly(Side.CLIENT) def getRenderBoundingBox: AxisAlignedBB = {
if (getMultiBlock && getMultiBlock.isConstructed) {
if (getMultiBlock.isPrimary && getMultiBlock.isConstructed) {
return INFINITE_EXTENT_AABB
}
return super.getRenderBoundingBox

10
src/main/scala/resonantinduction/atomic/schematic/SchematicAccelerator.java
View file

@ -2,11 +2,11 @@ package resonantinduction.atomic.schematic;
import java.util.HashMap;
import atomic.Atomic;
import net.minecraft.block.Block;
import net.minecraftforge.common.util.ForgeDirection;
import resonant.lib.schematic.Schematic;
import resonant.lib.type.Pair;
import resonantinduction.atomic.Atomic;
import universalelectricity.core.transform.vector.Vector3;
public class SchematicAccelerator extends Schematic
@ -20,7 +20,7 @@ public class SchematicAccelerator extends Schematic
@Override
public HashMap<Vector3, Pair<Block, Integer>> getStructure(ForgeDirection dir, int size)
{
HashMap<Vector3, Pair<Integer, Integer>> returnMap = new HashMap<Vector3, Pair<Integer, Integer>>();
HashMap<Vector3, Pair<Block, Integer>> returnMap = new HashMap<Vector3, Pair<Block, Integer>>();
int r = size;
@ -32,7 +32,7 @@ public class SchematicAccelerator extends Schematic
{
if (x == -r || x == r - 1 || z == -r || z == r - 1)
{
returnMap.put(new Vector3(x, y, z), new Pair(Atomic.blockElectromagnet.blockID, 0));
returnMap.put(new Vector3(x, y, z), new Pair(Atomic.blockElectromagnet, 0));
}
}
}
@ -48,7 +48,7 @@ public class SchematicAccelerator extends Schematic
{
if (x == -r || x == r - 1 || z == -r || z == r - 1)
{
returnMap.put(new Vector3(x, y, z), new Pair(Atomic.blockElectromagnet.blockID, 0));
returnMap.put(new Vector3(x, y, z), new Pair(Atomic.blockElectromagnet, 0));
}
}
}
@ -66,7 +66,7 @@ public class SchematicAccelerator extends Schematic
{
if (y == -1 || y == 1)
{
returnMap.put(new Vector3(x, y, z), new Pair(Atomic.blockElectromagnet.blockID, 1));
returnMap.put(new Vector3(x, y, z), new Pair(Atomic.blockElectromagnet, 1));
}
else if (y == 0)
{

29
src/main/scala/resonantinduction/atomic/schematic/SchematicBreedingReactor.java
View file

@ -3,10 +3,11 @@ package resonantinduction.atomic.schematic;
import java.util.HashMap;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraftforge.common.util.ForgeDirection;
import resonant.lib.schematic.Schematic;
import resonant.lib.type.Pair;
import atomic.Atomic;
import resonantinduction.atomic.Atomic;
import universalelectricity.core.transform.vector.Vector3;
public class SchematicBreedingReactor extends Schematic
@ -18,9 +19,9 @@ public class SchematicBreedingReactor extends Schematic
}
@Override
public HashMap<Vector3, Pair<Integer, Integer>> getStructure(ForgeDirection dir, int size)
public HashMap<Vector3, Pair<Block, Integer>> getStructure(ForgeDirection dir, int size)
{
HashMap<Vector3, Pair<Integer, Integer>> returnMap = new HashMap<Vector3, Pair<Integer, Integer>>();
HashMap<Vector3, Pair<Block, Integer>> returnMap = new HashMap<Vector3, Pair<Block, Integer>>();
int r = Math.max(size, 2);
@ -28,7 +29,7 @@ public class SchematicBreedingReactor extends Schematic
{
for (int z = -r; z <= r; z++)
{
returnMap.put(new Vector3(x, 0, z), new Pair(Block.waterStill.blockID, 0));
returnMap.put(new Vector3(x, 0, z), new Pair(Blocks.water, 0));
}
}
@ -40,28 +41,28 @@ public class SchematicBreedingReactor extends Schematic
{
Vector3 targetPosition = new Vector3(x, 1, z);
if (new Vector3(x, 0, z).getMagnitude() <= 2)
if (new Vector3(x, 0, z).magnitude() <= 2)
{
if (!((x == -r || x == r) && (z == -r || z == r)))
{
returnMap.put(new Vector3(x, 0, z), new Pair(Atomic.blockReactorCell.blockID, 0));
returnMap.put(new Vector3(x, -1, z), new Pair(Atomic.blockThermometer.blockID, 0));
returnMap.put(new Vector3(x, -3, z), new Pair(Atomic.blockSiren.blockID, 0));
returnMap.put(new Vector3(x, -2, z), new Pair(Block.redstoneWire.blockID, 0));
returnMap.put(new Vector3(x, 0, z), new Pair(Atomic.blockReactorCell, 0));
returnMap.put(new Vector3(x, -1, z), new Pair(Atomic.blockThermometer, 0));
returnMap.put(new Vector3(x, -3, z), new Pair(Atomic.blockSiren, 0));
returnMap.put(new Vector3(x, -2, z), new Pair(Blocks.redstone_wire, 0));
}
else
{
returnMap.put(new Vector3(x, -1, z), new Pair(Atomic.blockControlRod.blockID, 0));
returnMap.put(new Vector3(x, -2, z), new Pair(Block.pistonStickyBase.blockID, 1));
returnMap.put(new Vector3(x, -1, z), new Pair(Atomic.blockControlRod, 0));
returnMap.put(new Vector3(x, -2, z), new Pair(Blocks.piston, 1));
}
}
}
}
returnMap.put(new Vector3(0, -2, 0), new Pair(Block.stone.blockID, 0));
returnMap.put(new Vector3(0, -3, 0), new Pair(Block.stone.blockID, 0));
returnMap.put(new Vector3(), new Pair(Atomic.blockReactorCell.blockID, 0));
returnMap.put(new Vector3(0, -2, 0), new Pair(Blocks.stone, 0));
returnMap.put(new Vector3(0, -3, 0), new Pair(Blocks.stone, 0));
returnMap.put(new Vector3(), new Pair(Atomic.blockReactorCell, 0));
return returnMap;
}
}

40
src/main/scala/resonantinduction/atomic/schematic/SchematicFissionReactor.java
View file

@ -2,11 +2,13 @@ package resonantinduction.atomic.schematic;
import java.util.HashMap;
import atomic.Atomic;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraftforge.common.util.ForgeDirection;
import resonant.lib.schematic.Schematic;
import resonant.lib.type.Pair;
import resonantinduction.atomic.Atomic;
import universalelectricity.core.transform.vector.Vector3;
public class SchematicFissionReactor extends Schematic
@ -18,9 +20,9 @@ public class SchematicFissionReactor extends Schematic
}
@Override
public HashMap<Vector3, Pair<Integer, Integer>> getStructure(ForgeDirection dir, int size)
public HashMap<Vector3, Pair<Block, Integer>> getStructure(ForgeDirection dir, int size)
{
HashMap<Vector3, Pair<Integer, Integer>> returnMap = new HashMap<Vector3, Pair<Integer, Integer>>();
HashMap<Vector3, Pair<Block, Integer>> returnMap = new HashMap<Vector3, Pair<Block, Integer>>();
if (size <= 1)
{
@ -31,7 +33,7 @@ public class SchematicFissionReactor extends Schematic
for (int z = -r; z <= r; z++)
{
Vector3 targetPosition = new Vector3(x, 0, z);
returnMap.put(targetPosition, new Pair(Block.waterStill.blockID, 0));
returnMap.put(targetPosition, new Pair(Blocks.water, 0));
}
}
@ -43,21 +45,21 @@ public class SchematicFissionReactor extends Schematic
for (int z = -r; z <= r; z++)
{
Vector3 targetPosition = new Vector3(x, 1, z);
returnMap.put(targetPosition, new Pair(Atomic.blockElectricTurbine.blockID, 0));
returnMap.put(targetPosition, new Pair(Atomic.blockElectricTurbine, 0));
if (!((x == -r || x == r) && (z == -r || z == r)) && new Vector3(x, 0, z).getMagnitude() <= 1)
if (!((x == -r || x == r) && (z == -r || z == r)) && new Vector3(x, 0, z).magnitude() <= 1)
{
returnMap.put(new Vector3(x, -1, z), new Pair(Atomic.blockControlRod.blockID, 0));
returnMap.put(new Vector3(x, -2, z), new Pair(Block.pistonStickyBase.blockID, 1));
returnMap.put(new Vector3(x, -1, z), new Pair(Atomic.blockControlRod, 0));
returnMap.put(new Vector3(x, -2, z), new Pair(Blocks.sticky_piston, 1));
}
}
}
returnMap.put(new Vector3(0, -1, 0), new Pair(Atomic.blockThermometer.blockID, 0));
returnMap.put(new Vector3(0, -1, 0), new Pair(Atomic.blockThermometer, 0));
// TODO: IF Siren is a Tile, don't do this. Redstone can't hold it.
returnMap.put(new Vector3(0, -3, 0), new Pair(Atomic.blockSiren.blockID, 0));
returnMap.put(new Vector3(0, -2, 0), new Pair(Block.redstoneWire.blockID, 0));
returnMap.put(new Vector3(), new Pair(Atomic.blockReactorCell.blockID, 0));
returnMap.put(new Vector3(0, -3, 0), new Pair(Atomic.blockSiren, 0));
returnMap.put(new Vector3(0, -2, 0), new Pair(Blocks.redstone_wire, 0));
returnMap.put(new Vector3(), new Pair(Atomic.blockReactorCell, 0));
}
else
{
@ -76,7 +78,7 @@ public class SchematicFissionReactor extends Schematic
{
if (targetPosition.distance(leveledPosition) == 2)
{
returnMap.put(targetPosition, new Pair(Atomic.blockControlRod.blockID, 0));
returnMap.put(targetPosition, new Pair(Atomic.blockControlRod, 0));
/** Place piston base to push control rods in. */
int rotationMetadata = 0;
@ -84,32 +86,32 @@ public class SchematicFissionReactor extends Schematic
for (ForgeDirection checkDir : ForgeDirection.VALID_DIRECTIONS)
{
if (offset.x == checkDir.offsetX && offset.y == checkDir.offsetY && offset.z == checkDir.offsetZ)
if (offset.x() == checkDir.offsetX && offset.y() == checkDir.offsetY && offset.z() == checkDir.offsetZ)
{
rotationMetadata = checkDir.getOpposite().ordinal();
break;
}
}
returnMap.put(targetPosition.clone().add(offset), new Pair(Block.pistonStickyBase.blockID, rotationMetadata));
returnMap.put(targetPosition.clone().add(offset), new Pair(Blocks.sticky_piston, rotationMetadata));
}
else if (x == -r || x == r || z == -r || z == r)
{
returnMap.put(targetPosition, new Pair(Block.glass.blockID, 0));
returnMap.put(targetPosition, new Pair(Blocks.glass, 0));
}
else if (x == 0 && z == 0)
{
returnMap.put(targetPosition, new Pair(Atomic.blockReactorCell.blockID, 0));
returnMap.put(targetPosition, new Pair(Atomic.blockReactorCell, 0));
}
else
{
returnMap.put(targetPosition, new Pair(Block.waterMoving.blockID, 0));
returnMap.put(targetPosition, new Pair(Blocks.water, 0));
}
}
else if (targetPosition.distance(leveledPosition) < 2)
{
returnMap.put(targetPosition, new Pair(Atomic.blockElectricTurbine.blockID, 0));
returnMap.put(targetPosition, new Pair(Atomic.blockElectricTurbine, 0));
}
}
}

23
src/main/scala/resonantinduction/atomic/schematic/SchematicFusionReactor.java
View file

@ -2,10 +2,11 @@ package resonantinduction.atomic.schematic;
import java.util.HashMap;
import atomic.Atomic;
import net.minecraft.block.Block;
import net.minecraftforge.common.util.ForgeDirection;
import resonant.lib.schematic.Schematic;
import resonant.lib.type.Pair;
import resonantinduction.atomic.Atomic;
import universalelectricity.core.transform.vector.Vector3;
public class SchematicFusionReactor extends Schematic
@ -17,9 +18,9 @@ public class SchematicFusionReactor extends Schematic
}
@Override
public HashMap<Vector3, Pair<Integer, Integer>> getStructure(ForgeDirection dir, int size)
public HashMap<Vector3, Pair<Block, Integer>> getStructure(ForgeDirection dir, int size)
{
HashMap<Vector3, Pair<Integer, Integer>> returnMap = new HashMap<Vector3, Pair<Integer, Integer>>();
HashMap<Vector3, Pair<Block, Integer>> returnMap = new HashMap<Vector3, Pair<Block, Integer>>();
/** Fusion Torus */
int radius = size + 2;
@ -46,12 +47,12 @@ public class SchematicFusionReactor extends Schematic
{
double yDeviation = (y == 0 ? size / 3 : -size / 3) + (y == 0 ? -1 : 1) * Math.sin(magnitude / radius * Math.PI) * size / 2d;
Vector3 newPos = position.clone().add(0, yDeviation, 0);
returnMap.put(newPos.round(), new Pair(Atomic.blockElectromagnet.blockID, 1));
returnMap.put(newPos.round(), new Pair(Atomic.blockElectromagnet, 1));
}
}
else if (magnitude > radius - 1)
{
returnMap.put(position, new Pair(Atomic.blockElectromagnet.blockID, 0));
returnMap.put(position, new Pair(Atomic.blockElectromagnet, 0));
}
}
}
@ -60,14 +61,14 @@ public class SchematicFusionReactor extends Schematic
/** Fusion Core */
for (int y = 0; y < size; y++)
{
returnMap.put(new Vector3(0, y, 0), new Pair(Atomic.blockReactorCell.blockID, 0));
returnMap.put(new Vector3(1, y, 0), new Pair(Atomic.blockElectromagnet.blockID, 0));
returnMap.put(new Vector3(0, y, 1), new Pair(Atomic.blockElectromagnet.blockID, 0));
returnMap.put(new Vector3(0, y, -1), new Pair(Atomic.blockElectromagnet.blockID, 0));
returnMap.put(new Vector3(-1, y, 0), new Pair(Atomic.blockElectromagnet.blockID, 0));
returnMap.put(new Vector3(0, y, 0), new Pair(Atomic.blockReactorCell, 0));
returnMap.put(new Vector3(1, y, 0), new Pair(Atomic.blockElectromagnet, 0));
returnMap.put(new Vector3(0, y, 1), new Pair(Atomic.blockElectromagnet, 0));
returnMap.put(new Vector3(0, y, -1), new Pair(Atomic.blockElectromagnet, 0));
returnMap.put(new Vector3(-1, y, 0), new Pair(Atomic.blockElectromagnet, 0));
}
returnMap.put(new Vector3(0, 0, 0), new Pair(Atomic.blockReactorCell.blockID, 0));
returnMap.put(new Vector3(0, 0, 0), new Pair(Atomic.blockReactorCell, 0));
return returnMap;
}