Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.8.8

This commit is contained in:
Florian Nücke 2016-01-16 13:45:21 +01:00
commit 9f7daad118

View File

@ -4,13 +4,12 @@ import java.util
import li.cil.oc.common.asm.Injectable import li.cil.oc.common.asm.Injectable
import li.cil.oc.integration.Mods import li.cil.oc.integration.Mods
import net.minecraftforge.fml.common.Optional
@Injectable.Interface(value = "buildcraft.api.tiles.IHasWork", modid = Mods.IDs.BuildCraft) @Injectable.Interface(value = "buildcraft.api.tiles.IHasWork", modid = Mods.IDs.BuildCraft)
trait StateAware { trait StateAware {
def currentState: util.EnumSet[State] def currentState: util.EnumSet[State]
/* TODO BuildCraft
@Optional.Method(modid = Mods.IDs.BuildCraft) @Optional.Method(modid = Mods.IDs.BuildCraft)
def hasWork: Boolean = currentState.contains(State.CanWork) || currentState.contains(State.IsWorking) def hasWork: Boolean = currentState.contains(State.CanWork) || currentState.contains(State.IsWorking)
*/
} }