From 505715f33522d4201ca9b75a73bd110774606467 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Mon, 26 Jan 2015 20:35:38 +0800 Subject: [PATCH] Removed CustomDamageSource as it is redundant --- src/main/scala/edx/core/Settings.scala | 2 +- .../mech/process/grinder/TileGrindingWheel.scala | 7 +++---- .../mechanical/mech/process/mixer/TileMixer.scala | 2 +- .../scala/edx/quantum/blocks/BlockRadioactive.scala | 2 +- .../scala/edx/quantum/blocks/BlockToxicWaste.scala | 2 +- .../scala/edx/quantum/items/ItemRadioactive.scala | 2 +- .../quantum/machine/accelerator/EntityParticle.scala | 12 ++++++------ .../scala/edx/quantum/reactor/TileReactorCell.scala | 6 +++--- 8 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/main/scala/edx/core/Settings.scala b/src/main/scala/edx/core/Settings.scala index d84cd2495..c19cbcfda 100644 --- a/src/main/scala/edx/core/Settings.scala +++ b/src/main/scala/edx/core/Settings.scala @@ -7,7 +7,7 @@ import net.minecraftforge.common.config.Configuration import resonantengine.api.edx.recipe.QuantumAssemblerRecipes import resonantengine.lib.mod.config.Config import resonantengine.lib.mod.config.ConfigEvent.PostConfigEvent -import resonantengine.lib.prefab.poison.PotionRadiation +import resonantengine.lib.poison.PotionRadiation import scala.collection.convert.wrapAll._ diff --git a/src/main/scala/edx/mechanical/mech/process/grinder/TileGrindingWheel.scala b/src/main/scala/edx/mechanical/mech/process/grinder/TileGrindingWheel.scala index cc7128b1b..557cf39ea 100644 --- a/src/main/scala/edx/mechanical/mech/process/grinder/TileGrindingWheel.scala +++ b/src/main/scala/edx/mechanical/mech/process/grinder/TileGrindingWheel.scala @@ -7,17 +7,16 @@ import net.minecraft.block.material.Material import net.minecraft.entity.Entity import net.minecraft.entity.item.EntityItem import net.minecraft.item.{ItemBlock, ItemStack} -import net.minecraft.util.ResourceLocation +import net.minecraft.util.{DamageSource, ResourceLocation} import net.minecraftforge.client.model.AdvancedModelLoader import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11._ import resonantengine.api.edx.recipe.{MachineRecipes, RecipeType} -import resonantengine.lib.prefab.Timer -import resonantengine.lib.prefab.damage.CustomDamageSource import resonantengine.lib.render.RenderUtility import resonantengine.lib.transform.region.Cuboid import resonantengine.lib.transform.rotation.AngleAxis import resonantengine.lib.transform.vector.Vector3 +import resonantengine.prefab.misc.Timer /** * The grinding wheel. This block will face the direction in which it can rotate. @@ -162,7 +161,7 @@ class TileGrindingWheel extends TileMechanical(Material.rock) } else { - entity.attackEntityFrom(new CustomDamageSource("grinder", this), 2) + entity.attackEntityFrom(new DamageSource("grinder"), 2) } } diff --git a/src/main/scala/edx/mechanical/mech/process/mixer/TileMixer.scala b/src/main/scala/edx/mechanical/mech/process/mixer/TileMixer.scala index 45d3eb1c6..5da1dcc79 100644 --- a/src/main/scala/edx/mechanical/mech/process/mixer/TileMixer.scala +++ b/src/main/scala/edx/mechanical/mech/process/mixer/TileMixer.scala @@ -16,10 +16,10 @@ import net.minecraftforge.fluids.IFluidBlock import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11._ import resonantengine.api.edx.recipe.{MachineRecipes, RecipeType} -import resonantengine.lib.prefab.Timer import resonantengine.lib.render.RenderUtility import resonantengine.lib.transform.rotation.Quaternion import resonantengine.lib.transform.vector.Vector3 +import resonantengine.prefab.misc.Timer import scala.collection.JavaConversions._ diff --git a/src/main/scala/edx/quantum/blocks/BlockRadioactive.scala b/src/main/scala/edx/quantum/blocks/BlockRadioactive.scala index 53aebc4c5..d4de35ddf 100644 --- a/src/main/scala/edx/quantum/blocks/BlockRadioactive.scala +++ b/src/main/scala/edx/quantum/blocks/BlockRadioactive.scala @@ -12,7 +12,7 @@ import net.minecraft.entity.{Entity, EntityLiving, EntityLivingBase} import net.minecraft.init.Blocks import net.minecraft.util.{AxisAlignedBB, IIcon} import net.minecraft.world.World -import resonantengine.lib.prefab.poison.PoisonRadiation +import resonantengine.lib.poison.PoisonRadiation import resonantengine.lib.transform.vector.Vector3 import scala.collection.JavaConversions._ diff --git a/src/main/scala/edx/quantum/blocks/BlockToxicWaste.scala b/src/main/scala/edx/quantum/blocks/BlockToxicWaste.scala index 20f684eec..a61e6922d 100644 --- a/src/main/scala/edx/quantum/blocks/BlockToxicWaste.scala +++ b/src/main/scala/edx/quantum/blocks/BlockToxicWaste.scala @@ -8,7 +8,7 @@ import net.minecraft.entity.{Entity, EntityLivingBase} import net.minecraft.util.DamageSource import net.minecraft.world.World import net.minecraftforge.fluids.BlockFluidClassic -import resonantengine.lib.prefab.poison.PoisonRadiation +import resonantengine.lib.poison.PoisonRadiation import resonantengine.lib.transform.vector.Vector3 class BlockToxicWaste extends BlockFluidClassic(QuantumContent.getFluidToxicWaste, Material.water) diff --git a/src/main/scala/edx/quantum/items/ItemRadioactive.scala b/src/main/scala/edx/quantum/items/ItemRadioactive.scala index c7861d692..d025ae023 100644 --- a/src/main/scala/edx/quantum/items/ItemRadioactive.scala +++ b/src/main/scala/edx/quantum/items/ItemRadioactive.scala @@ -3,7 +3,7 @@ package edx.quantum.items import net.minecraft.entity.{Entity, EntityLivingBase} import net.minecraft.item.{Item, ItemStack} import net.minecraft.world.World -import resonantengine.lib.prefab.poison.PoisonRadiation +import resonantengine.lib.poison.PoisonRadiation import resonantengine.lib.transform.vector.Vector3 /** diff --git a/src/main/scala/edx/quantum/machine/accelerator/EntityParticle.scala b/src/main/scala/edx/quantum/machine/accelerator/EntityParticle.scala index f27bd9a68..560dbc758 100644 --- a/src/main/scala/edx/quantum/machine/accelerator/EntityParticle.scala +++ b/src/main/scala/edx/quantum/machine/accelerator/EntityParticle.scala @@ -15,7 +15,7 @@ import net.minecraftforge.common.ForgeChunkManager import net.minecraftforge.common.ForgeChunkManager.Type import net.minecraftforge.common.util.ForgeDirection import resonantengine.api.tile.IElectromagnet -import resonantengine.lib.prefab.poison.PoisonRadiation +import resonantengine.lib.poison.PoisonRadiation import resonantengine.lib.transform.vector.Vector3 import scala.collection.JavaConversions._ @@ -229,6 +229,11 @@ class EntityParticle(par1World: World) extends Entity(par1World) with IEntityAdd return this.getParticleVelocity - (this.getParticleVelocity / Math.min(Math.max(70 * this.getParticleVelocity, 4), 30)) } + override def applyEntityCollision(par1Entity: Entity) + { + this.handleCollisionWithEntity + } + def handleCollisionWithEntity { this.worldObj.playSoundAtEntity(this, Reference.prefix + "antimatter", 1.5f, 1f - this.worldObj.rand.nextFloat * 0.3f) @@ -270,11 +275,6 @@ class EntityParticle(par1World: World) extends Entity(par1World) with IEntityAdd super.setDead } - override def applyEntityCollision(par1Entity: Entity) - { - this.handleCollisionWithEntity - } - protected override def entityInit { this.dataWatcher.addObject(EntityParticle.MOVEMENT_DIRECTION_DATAWATCHER_ID, 3.asInstanceOf[Byte]) diff --git a/src/main/scala/edx/quantum/reactor/TileReactorCell.scala b/src/main/scala/edx/quantum/reactor/TileReactorCell.scala index bfba0da11..d4d04b78a 100644 --- a/src/main/scala/edx/quantum/reactor/TileReactorCell.scala +++ b/src/main/scala/edx/quantum/reactor/TileReactorCell.scala @@ -21,7 +21,7 @@ import net.minecraftforge.common.util.ForgeDirection import org.lwjgl.opengl.GL11 import resonantengine.api.edx.machine.{IReactor, IReactorComponent} import resonantengine.lib.grid.thermal.{GridThermal, ThermalPhysics} -import resonantengine.lib.prefab.poison.PoisonRadiation +import resonantengine.lib.poison.PoisonRadiation import resonantengine.lib.render.RenderUtility import resonantengine.lib.render.model.ModelCube import resonantengine.lib.transform.vector.Vector3 @@ -115,6 +115,8 @@ class TileReactorCell extends TileInventory(Material.iron) with IMultiBlockStruc return lowest } + override def getMultiBlock: MultiBlockHandler[TileReactorCell] = multiBlock + override def onNeighborChanged(block: Block) { updatePositionStatus() @@ -283,8 +285,6 @@ class TileReactorCell extends TileInventory(Material.iron) with IMultiBlockStruc getMultiBlock.load(nbt) } - override def getMultiBlock: MultiBlockHandler[TileReactorCell] = multiBlock - override def writeToNBT(nbt: NBTTagCompound) { super.writeToNBT(nbt)