AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-14 01:39:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1994 from makkarpov/sign-upgrades

Browse Source 
Added SignChangeEvent to sign upgrade
This commit is contained in:
Florian "Sangar" Nücke 2016-09-18 20:18:27 +02:00 committed by GitHub
commit e36d8ec425
2 changed files with 49 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/li/cil/oc/api/event/SignChangeEvent.java Normal file
View File

@ -0,0 +1,31 @@
package li.cil.oc.api.event;
import cpw.mods.fml.common.eventhandler.Cancelable;
import cpw.mods.fml.common.eventhandler.Event;
import net.minecraft.tileentity.TileEntitySign;
/**
* A bit more specific sign change event that holds information about new text of the sign. Used in the sign upgrade.
*/
public abstract class SignChangeEvent extends Event {
public final TileEntitySign sign;
public final String[] lines;
private SignChangeEvent(TileEntitySign sign, String[] lines) {
this.sign = sign;
this.lines = lines;
}
@Cancelable
public static class Pre extends SignChangeEvent {
public Pre(TileEntitySign sign, String[] lines) {
super(sign, lines);
}
}
public static class Post extends SignChangeEvent {
public Post(TileEntitySign sign, String[] lines) {
super(sign, lines);
}
}
}

22
src/main/scala/li/cil/oc/server/component/UpgradeSign.scala
View File

@ -9,6 +9,7 @@ import li.cil.oc.api.driver.DeviceInfo.DeviceClass
import li.cil.oc.Settings import li.cil.oc.Settings
import li.cil.oc.api import li.cil.oc.api
import li.cil.oc.api.driver.DeviceInfo import li.cil.oc.api.driver.DeviceInfo
import li.cil.oc.api.event.SignChangeEvent
import li.cil.oc.api.network.EnvironmentHost import li.cil.oc.api.network.EnvironmentHost
import li.cil.oc.api.internal import li.cil.oc.api.internal
import li.cil.oc.api.network.Message import li.cil.oc.api.network.Message
@ -53,12 +54,18 @@ abstract class UpgradeSign extends prefab.ManagedEnvironment with DeviceInfo {
case robot: internal.Robot => robot.player case robot: internal.Robot => robot.player
case _ => FakePlayerFactory.get(host.world.asInstanceOf[WorldServer], Settings.get.fakePlayerProfile) case _ => FakePlayerFactory.get(host.world.asInstanceOf[WorldServer], Settings.get.fakePlayerProfile)
} }
if (!canChangeSign(player, sign)) {
val lines = text.lines.padTo(4, "").map(line => if (line.length > 15) line.substring(0, 15) else line).toArray
if (!canChangeSign(player, sign, lines)) {
return result(Unit, "not allowed") return result(Unit, "not allowed")
} }
text.lines.padTo(4, "").map(line => if (line.length > 15) line.substring(0, 15) else line).copyToArray(sign.signText) lines.copyToArray(sign.signText)
host.world.markBlockForUpdate(sign.xCoord, sign.yCoord, sign.zCoord) host.world.markBlockForUpdate(sign.xCoord, sign.yCoord, sign.zCoord)
MinecraftForge.EVENT_BUS.post(new SignChangeEvent.Post(sign, lines))
result(sign.signText.mkString("\n")) result(sign.signText.mkString("\n"))
case _ => result(Unit, "no sign") case _ => result(Unit, "no sign")
} }
@ -75,13 +82,20 @@ abstract class UpgradeSign extends prefab.ManagedEnvironment with DeviceInfo {
} }
} }
private def canChangeSign(player: EntityPlayer, tileEntity: TileEntitySign): Boolean = { private def canChangeSign(player: EntityPlayer, tileEntity: TileEntitySign, lines: Array[String]): Boolean = {
if (!host.world.canMineBlock(player, tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord)) { if (!host.world.canMineBlock(player, tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord)) {
return false return false
} }
val event = new BlockEvent.BreakEvent(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord, host.world, tileEntity.getBlockType, tileEntity.getBlockMetadata, player) val event = new BlockEvent.BreakEvent(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord, host.world, tileEntity.getBlockType, tileEntity.getBlockMetadata, player)
MinecraftForge.EVENT_BUS.post(event) MinecraftForge.EVENT_BUS.post(event)
!(event.isCanceled || event.getResult == Event.Result.DENY) if (event.isCanceled || event.getResult == Event.Result.DENY) {
return false
}
val signEvent = new SignChangeEvent.Pre(tileEntity, lines)
MinecraftForge.EVENT_BUS.post(signEvent)
!(signEvent.isCanceled || signEvent.getResult == Event.Result.DENY)
} }
override def onMessage(message: Message): Unit = { override def onMessage(message: Message): Unit = {