Refactored potion and poisonclasses
This commit is contained in:
parent
505715f335
commit
6c7c403fe9
|
@ -7,7 +7,7 @@ import net.minecraftforge.common.config.Configuration
|
||||||
import resonantengine.api.edx.recipe.QuantumAssemblerRecipes
|
import resonantengine.api.edx.recipe.QuantumAssemblerRecipes
|
||||||
import resonantengine.lib.mod.config.Config
|
import resonantengine.lib.mod.config.Config
|
||||||
import resonantengine.lib.mod.config.ConfigEvent.PostConfigEvent
|
import resonantengine.lib.mod.config.ConfigEvent.PostConfigEvent
|
||||||
import resonantengine.lib.poison.PotionRadiation
|
import resonantengine.lib.potion.PotionRadiation
|
||||||
|
|
||||||
import scala.collection.convert.wrapAll._
|
import scala.collection.convert.wrapAll._
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ import net.minecraft.entity.{Entity, EntityLiving, EntityLivingBase}
|
||||||
import net.minecraft.init.Blocks
|
import net.minecraft.init.Blocks
|
||||||
import net.minecraft.util.{AxisAlignedBB, IIcon}
|
import net.minecraft.util.{AxisAlignedBB, IIcon}
|
||||||
import net.minecraft.world.World
|
import net.minecraft.world.World
|
||||||
import resonantengine.lib.poison.PoisonRadiation
|
import resonantengine.lib.potion.PoisonRadiation
|
||||||
import resonantengine.lib.transform.vector.Vector3
|
import resonantengine.lib.transform.vector.Vector3
|
||||||
|
|
||||||
import scala.collection.JavaConversions._
|
import scala.collection.JavaConversions._
|
||||||
|
|
|
@ -8,7 +8,7 @@ import net.minecraft.entity.{Entity, EntityLivingBase}
|
||||||
import net.minecraft.util.DamageSource
|
import net.minecraft.util.DamageSource
|
||||||
import net.minecraft.world.World
|
import net.minecraft.world.World
|
||||||
import net.minecraftforge.fluids.BlockFluidClassic
|
import net.minecraftforge.fluids.BlockFluidClassic
|
||||||
import resonantengine.lib.poison.PoisonRadiation
|
import resonantengine.lib.potion.PoisonRadiation
|
||||||
import resonantengine.lib.transform.vector.Vector3
|
import resonantengine.lib.transform.vector.Vector3
|
||||||
|
|
||||||
class BlockToxicWaste extends BlockFluidClassic(QuantumContent.getFluidToxicWaste, Material.water)
|
class BlockToxicWaste extends BlockFluidClassic(QuantumContent.getFluidToxicWaste, Material.water)
|
||||||
|
|
|
@ -3,7 +3,7 @@ package edx.quantum.items
|
||||||
import net.minecraft.entity.{Entity, EntityLivingBase}
|
import net.minecraft.entity.{Entity, EntityLivingBase}
|
||||||
import net.minecraft.item.{Item, ItemStack}
|
import net.minecraft.item.{Item, ItemStack}
|
||||||
import net.minecraft.world.World
|
import net.minecraft.world.World
|
||||||
import resonantengine.lib.poison.PoisonRadiation
|
import resonantengine.lib.potion.PoisonRadiation
|
||||||
import resonantengine.lib.transform.vector.Vector3
|
import resonantengine.lib.transform.vector.Vector3
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -15,7 +15,7 @@ import net.minecraftforge.common.ForgeChunkManager
|
||||||
import net.minecraftforge.common.ForgeChunkManager.Type
|
import net.minecraftforge.common.ForgeChunkManager.Type
|
||||||
import net.minecraftforge.common.util.ForgeDirection
|
import net.minecraftforge.common.util.ForgeDirection
|
||||||
import resonantengine.api.tile.IElectromagnet
|
import resonantengine.api.tile.IElectromagnet
|
||||||
import resonantengine.lib.poison.PoisonRadiation
|
import resonantengine.lib.potion.PoisonRadiation
|
||||||
import resonantengine.lib.transform.vector.Vector3
|
import resonantengine.lib.transform.vector.Vector3
|
||||||
|
|
||||||
import scala.collection.JavaConversions._
|
import scala.collection.JavaConversions._
|
||||||
|
@ -229,9 +229,9 @@ class EntityParticle(par1World: World) extends Entity(par1World) with IEntityAdd
|
||||||
return this.getParticleVelocity - (this.getParticleVelocity / Math.min(Math.max(70 * this.getParticleVelocity, 4), 30))
|
return this.getParticleVelocity - (this.getParticleVelocity / Math.min(Math.max(70 * this.getParticleVelocity, 4), 30))
|
||||||
}
|
}
|
||||||
|
|
||||||
override def applyEntityCollision(par1Entity: Entity)
|
def getParticleVelocity: Double =
|
||||||
{
|
{
|
||||||
this.handleCollisionWithEntity
|
return Math.abs(this.motionX) + Math.abs(this.motionY) + Math.abs(this.motionZ)
|
||||||
}
|
}
|
||||||
|
|
||||||
def handleCollisionWithEntity
|
def handleCollisionWithEntity
|
||||||
|
@ -264,17 +264,17 @@ class EntityParticle(par1World: World) extends Entity(par1World) with IEntityAdd
|
||||||
setDead
|
setDead
|
||||||
}
|
}
|
||||||
|
|
||||||
def getParticleVelocity: Double =
|
|
||||||
{
|
|
||||||
return Math.abs(this.motionX) + Math.abs(this.motionY) + Math.abs(this.motionZ)
|
|
||||||
}
|
|
||||||
|
|
||||||
override def setDead
|
override def setDead
|
||||||
{
|
{
|
||||||
ForgeChunkManager.releaseTicket(this.updateTicket)
|
ForgeChunkManager.releaseTicket(this.updateTicket)
|
||||||
super.setDead
|
super.setDead
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override def applyEntityCollision(par1Entity: Entity)
|
||||||
|
{
|
||||||
|
this.handleCollisionWithEntity
|
||||||
|
}
|
||||||
|
|
||||||
protected override def entityInit
|
protected override def entityInit
|
||||||
{
|
{
|
||||||
this.dataWatcher.addObject(EntityParticle.MOVEMENT_DIRECTION_DATAWATCHER_ID, 3.asInstanceOf[Byte])
|
this.dataWatcher.addObject(EntityParticle.MOVEMENT_DIRECTION_DATAWATCHER_ID, 3.asInstanceOf[Byte])
|
||||||
|
|
|
@ -21,7 +21,7 @@ import net.minecraftforge.common.util.ForgeDirection
|
||||||
import org.lwjgl.opengl.GL11
|
import org.lwjgl.opengl.GL11
|
||||||
import resonantengine.api.edx.machine.{IReactor, IReactorComponent}
|
import resonantengine.api.edx.machine.{IReactor, IReactorComponent}
|
||||||
import resonantengine.lib.grid.thermal.{GridThermal, ThermalPhysics}
|
import resonantengine.lib.grid.thermal.{GridThermal, ThermalPhysics}
|
||||||
import resonantengine.lib.poison.PoisonRadiation
|
import resonantengine.lib.potion.PoisonRadiation
|
||||||
import resonantengine.lib.render.RenderUtility
|
import resonantengine.lib.render.RenderUtility
|
||||||
import resonantengine.lib.render.model.ModelCube
|
import resonantengine.lib.render.model.ModelCube
|
||||||
import resonantengine.lib.transform.vector.Vector3
|
import resonantengine.lib.transform.vector.Vector3
|
||||||
|
@ -115,8 +115,6 @@ class TileReactorCell extends TileInventory(Material.iron) with IMultiBlockStruc
|
||||||
return lowest
|
return lowest
|
||||||
}
|
}
|
||||||
|
|
||||||
override def getMultiBlock: MultiBlockHandler[TileReactorCell] = multiBlock
|
|
||||||
|
|
||||||
override def onNeighborChanged(block: Block)
|
override def onNeighborChanged(block: Block)
|
||||||
{
|
{
|
||||||
updatePositionStatus()
|
updatePositionStatus()
|
||||||
|
@ -245,6 +243,8 @@ class TileReactorCell extends TileInventory(Material.iron) with IMultiBlockStruc
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override def getMultiBlock: MultiBlockHandler[TileReactorCell] = multiBlock
|
||||||
|
|
||||||
override def getWorld: World =
|
override def getWorld: World =
|
||||||
{
|
{
|
||||||
return worldObj
|
return worldObj
|
||||||
|
|
Loading…
Reference in a new issue