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

Use generic events properly.

Browse Source
This commit is contained in:
Vexatos 2017-05-14 23:19:03 +02:00
parent 2740b81cc0
commit e3743d1cb0
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/li/cil/oc/common/EventHandler.scala
View File

@ -111,14 +111,14 @@ object EventHandler {
}
@SubscribeEvent
def onAttachCapabilities(event: AttachCapabilitiesEvent.TileEntity): Unit = {
event.getTileEntity match {
def onAttachCapabilities(event: AttachCapabilitiesEvent[TileEntity]): Unit = {
event.getObject match {
case tileEntity: TileEntity with Environment =>
event.addCapability(CapabilityEnvironment.ProviderEnvironment, new CapabilityEnvironment.Provider(tileEntity))
case _ =>
}
event.getTileEntity match {
event.getObject match {
case tileEntity: TileEntity with Environment with SidedComponent =>
event.addCapability(CapabilitySidedComponent.SidedComponent, new CapabilitySidedComponent.Provider(tileEntity))
case tileEntity: TileEntity with SidedEnvironment =>
@ -126,7 +126,7 @@ object EventHandler {
case _ =>
}
event.getTileEntity match {
event.getObject match {
case tileEntity: TileEntity with Colored =>
event.addCapability(CapabilityColored.ProviderColored, new CapabilityColored.Provider(tileEntity))
case _ =>

5
src/main/scala/li/cil/oc/integration/minecraftforge/EventHandlerMinecraftForge.scala
View File

@ -2,6 +2,7 @@ package li.cil.oc.integration.minecraftforge
import li.cil.oc.OpenComputers
import li.cil.oc.common.tileentity.traits.PowerAcceptor
import li.cil.oc.common.tileentity.traits.TileEntity
import li.cil.oc.integration.util.Power
import net.minecraft.item.ItemStack
import net.minecraft.util.EnumFacing
@ -16,8 +17,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
object EventHandlerMinecraftForge {
@SubscribeEvent
def onAttachCapabilities(event: AttachCapabilitiesEvent.TileEntity): Unit = {
event.getTileEntity match {
def onAttachCapabilities(event: AttachCapabilitiesEvent[TileEntity]): Unit = {
event.getObject match {
case tileEntity: PowerAcceptor =>
event.addCapability(ProviderEnergy, new Provider(tileEntity))
case _ =>