AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-16 18:55:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Using FakePlayer as base class for robot base class... seems to work, although I remember some things breaking when I last tried... well, it's unstable right now anyway so let's do this.

Browse Source
This commit is contained in:
Florian Nücke 2014-06-09 23:23:17 +02:00
parent eacaa45372
commit c38803cff0
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/scala/li/cil/oc/server/component/robot/Player.scala
View File

@ -14,8 +14,7 @@ import net.minecraft.item.{Item, ItemBlock, ItemStack}
import net.minecraft.potion.PotionEffect import net.minecraft.potion.PotionEffect
import net.minecraft.server.MinecraftServer import net.minecraft.server.MinecraftServer
import net.minecraft.util._ import net.minecraft.util._
import net.minecraft.world.World import net.minecraftforge.common.{FakePlayer, MinecraftForge, ForgeHooks, ForgeDirection}
import net.minecraftforge.common.{MinecraftForge, ForgeHooks, ForgeDirection}
import net.minecraftforge.event.entity.player.{EntityInteractEvent, PlayerInteractEvent} import net.minecraftforge.event.entity.player.{EntityInteractEvent, PlayerInteractEvent}
import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action
import net.minecraftforge.event.world.BlockEvent import net.minecraftforge.event.world.BlockEvent
@ -24,7 +23,7 @@ import net.minecraftforge.fluids.FluidRegistry
import scala.collection.convert.WrapAsScala._ import scala.collection.convert.WrapAsScala._
import scala.reflect._ import scala.reflect._
class Player(val robot: tileentity.Robot) extends EntityPlayer(robot.world, Settings.get.nameFormat.replace("$player$", robot.owner).replace("$random$", (robot.world.rand.nextInt(0xFFFFFF) + 1).toString)) { class Player(val robot: tileentity.Robot) extends FakePlayer(robot.world, Settings.get.nameFormat.replace("$player$", robot.owner).replace("$random$", (robot.world.rand.nextInt(0xFFFFFF) + 1).toString)) {
capabilities.allowFlying = true capabilities.allowFlying = true
capabilities.disableDamage = true capabilities.disableDamage = true
capabilities.isFlying = true capabilities.isFlying = true
@ -47,6 +46,8 @@ class Player(val robot: tileentity.Robot) extends EntityPlayer(robot.world, Sett
override def getPlayerCoordinates = new ChunkCoordinates(robot.x, robot.y, robot.z) override def getPlayerCoordinates = new ChunkCoordinates(robot.x, robot.y, robot.z)
override def getDefaultEyeHeight = 0f
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //
def updatePositionAndRotation(facing: ForgeDirection, side: ForgeDirection) { def updatePositionAndRotation(facing: ForgeDirection, side: ForgeDirection) {
@ -418,8 +419,6 @@ class Player(val robot: tileentity.Robot) extends EntityPlayer(robot.world, Sett
MinecraftForge.EVENT_BUS.post(new RobotExhaustionEvent(robot, amount)) MinecraftForge.EVENT_BUS.post(new RobotExhaustionEvent(robot, amount))
} }
override def openGui(mod: AnyRef, modGuiId: Int, world: World, x: Int, y: Int, z: Int) {}
override def displayGUIMerchant(merchant: IMerchant, name: String) { override def displayGUIMerchant(merchant: IMerchant, name: String) {
merchant.setCustomer(null) merchant.setCustomer(null)
} }
@ -428,8 +427,7 @@ class Player(val robot: tileentity.Robot) extends EntityPlayer(robot.world, Sett
override def swingItem() {} override def swingItem() {}
override def canAttackPlayer(player: EntityPlayer) = override def canAttackPlayer(player: EntityPlayer) = Settings.get.canAttackPlayers
Settings.get.canAttackPlayers && super.canAttackPlayer(player)
override def canEat(value: Boolean) = false override def canEat(value: Boolean) = false
@ -439,18 +437,12 @@ class Player(val robot: tileentity.Robot) extends EntityPlayer(robot.world, Sett
override def attackEntityFrom(source: DamageSource, damage: Float) = false override def attackEntityFrom(source: DamageSource, damage: Float) = false
override def isEntityInvulnerable = true
override def heal(amount: Float) {} override def heal(amount: Float) {}
override def setHealth(value: Float) {} override def setHealth(value: Float) {}
override def setDead() = isDead = true override def setDead() = isDead = true
override def onDeath(source: DamageSource) {}
override def onUpdate() {}
override def onLivingUpdate() {} override def onLivingUpdate() {}
override def onItemPickup(entity: Entity, count: Int) {} override def onItemPickup(entity: Entity, count: Int) {}
@ -463,11 +455,5 @@ class Player(val robot: tileentity.Robot) extends EntityPlayer(robot.world, Sett
override def mountEntity(entity: Entity) {} override def mountEntity(entity: Entity) {}
override def travelToDimension(dimension: Int) {}
override def sleepInBedAt(x: Int, y: Int, z: Int) = EnumStatus.OTHER_PROBLEM override def sleepInBedAt(x: Int, y: Int, z: Int) = EnumStatus.OTHER_PROBLEM
override def canCommandSenderUseCommand(i: Int, s: String) = false
override def sendChatToPlayer(message: ChatMessageComponent) {}
} }