Added TIS-3D integration.

# Conflicts:
#	build.gradle
#	build.properties
#	src/main/scala/li/cil/oc/integration/Mods.scala
#	src/main/scala/li/cil/oc/integration/tis3d/SerialInterfaceProviderAdapter.scala
This commit is contained in:
Florian Nücke 2015-12-29 09:22:12 +01:00
parent 02043ed83b
commit 4faf61976c
4 changed files with 23 additions and 12 deletions

View File

@ -69,20 +69,9 @@ if (JavaVersion.current().isJava8Compatible()) {
repositories {
maven {
name = "chickenbones"
url = "http://chickenbones.net/maven/"
}
maven {
name = "mobius"
url = "http://mobiusstrip.eu/maven"
}
maven {
name = "fallback"
name = "TIS-3D"
url = "http://maven.cil.li/"
}
maven {
url "http://dvs1.progwml6.com/files/maven"
}
/*
maven {
name = "BluePower"
@ -199,6 +188,7 @@ dependencies {
provided "com.bluepowermod:BluePower:${config.bluepower.version}:deobf"
provided "com.gregoriust.gregtech:gregtech_${config.minecraft.version}:${config.gt.version}:dev"
provided "igwmod:IGW-Mod-1.7.10:${config.igwmod.version}:userdev"
provided "li.cil.tis3d:TIS-3D:${config.tis3d.version}:dev"
provided "mcp.mobius.waila:Waila:${config.waila.version}_${config.minecraft.version}:dev"
provided "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev"
provided "net.sengir.forestry:forestry_${config.minecraft.version}:${config.forestry.version}:dev"

View File

@ -0,0 +1,7 @@
# Adapter
![Freeeedooooooom!](block:OpenComputers:adapter)
The adapter's serial interface does not implement a hard-coded protocol. Instead, the protocol is defined by the software running on the computer controlling the adapter. Please refer to the component's API using an OpenComputers computer for specifics.
The adapter's serial interface has a small internal buffer for values passed along in either direction. Note that by default the adapter's serial interface does not read from the serial port. Reading has to be enabled from the component's API.

View File

@ -79,6 +79,7 @@ object Mods {
val Thaumcraft = new SimpleMod(IDs.Thaumcraft)
val ThermalExpansion = new SimpleMod(IDs.ThermalExpansion, providesPower = true)
val TinkersConstruct = new SimpleMod(IDs.TinkersConstruct)
val TIS3D = new SimpleMod(IDs.TIS3D, version = "@[0.7,)")
val TMechWorks = new SimpleMod(IDs.TMechWorks)
val VersionChecker = new SimpleMod(IDs.VersionChecker)
val Waila = new SimpleMod(IDs.Waila)
@ -218,6 +219,7 @@ object Mods {
final val Thaumcraft = "Thaumcraft"
final val ThermalExpansion = "ThermalExpansion"
final val TinkersConstruct = "TConstruct"
final val TIS3D = "tis3d"
final val TMechWorks = "TMechworks"
final val VersionChecker = "VersionChecker"
final val Waila = "Waila"

View File

@ -0,0 +1,12 @@
package li.cil.oc.integration.tis3d
import li.cil.oc.integration.ModProxy
import li.cil.oc.integration.Mods
object ModTIS3D extends ModProxy {
override def getMod = Mods.TIS3D
override def initialize(): Unit = {
SerialInterfaceProviderAdapter.init()
}
}