mirror of
https://github.com/MightyPirates/OpenComputers.git
synced 2025-09-30 00:26:16 -04:00
Added geolyzer function to get underground oil info
updated GT and EIO references
This commit is contained in:
parent
8d81073eca
commit
4797485dc2
14
build.gradle
14
build.gradle
@ -25,6 +25,10 @@ apply plugin: 'idea'
|
|||||||
apply plugin: 'maven-publish'
|
apply plugin: 'maven-publish'
|
||||||
apply plugin: 'com.matthewprenger.cursegradle'
|
apply plugin: 'com.matthewprenger.cursegradle'
|
||||||
|
|
||||||
|
tasks.withType(ScalaCompile) {
|
||||||
|
scalaCompileOptions.additionalParameters = ["-deprecation:false"]
|
||||||
|
}
|
||||||
|
|
||||||
file "build.properties" withReader {
|
file "build.properties" withReader {
|
||||||
def prop = new Properties()
|
def prop = new Properties()
|
||||||
prop.load(it)
|
prop.load(it)
|
||||||
@ -103,6 +107,14 @@ repositories {
|
|||||||
name = "gt"
|
name = "gt"
|
||||||
url = "http://gregtech.overminddl1.com/"
|
url = "http://gregtech.overminddl1.com/"
|
||||||
}
|
}
|
||||||
|
ivy {
|
||||||
|
name 'gtnh_download_source'
|
||||||
|
artifactPattern "http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]-[revision].[ext]"
|
||||||
|
}
|
||||||
|
maven { // GalacticGreg, YAMCore,..
|
||||||
|
name 'UsrvDE'
|
||||||
|
url "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
configurations {
|
configurations {
|
||||||
@ -121,7 +133,7 @@ dependencies {
|
|||||||
compileOnly "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev"
|
compileOnly "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev"
|
||||||
compileOnly "codechicken:WR-CBE:${config.minecraft.version}-${config.wrcbe.version}:dev"
|
compileOnly "codechicken:WR-CBE:${config.minecraft.version}-${config.wrcbe.version}:dev"
|
||||||
compileOnly "com.bluepowermod:BluePower:${config.bluepower.version}:deobf"
|
compileOnly "com.bluepowermod:BluePower:${config.bluepower.version}:deobf"
|
||||||
compileOnly "com.gregoriust.gregtech:gregtech_${config.minecraft.version}:${config.gt.version}:dev"
|
compileOnly "com.gregoriust.gregtech:gregtech:${config.gt.version}:dev"
|
||||||
compileOnly "igwmod:IGW-Mod-1.7.10:${config.igwmod.version}:userdev"
|
compileOnly "igwmod:IGW-Mod-1.7.10:${config.igwmod.version}:userdev"
|
||||||
compileOnly "li.cil.tis3d:TIS-3D:${config.tis3d.version}:dev"
|
compileOnly "li.cil.tis3d:TIS-3D:${config.tis3d.version}:dev"
|
||||||
compileOnly "mcp.mobius.waila:Waila:${config.waila.version}_${config.minecraft.version}:dev"
|
compileOnly "mcp.mobius.waila:Waila:${config.waila.version}_${config.minecraft.version}:dev"
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
minecraft.version=1.7.10
|
minecraft.version=1.7.10
|
||||||
forge.version=10.13.4.1614-1.7.10
|
forge.version=10.13.4.1614-1.7.10
|
||||||
|
|
||||||
oc.version=1.7.5.6
|
oc.version=1.7.5.7-GTNH
|
||||||
|
|
||||||
ae2.version=rv2-beta-26
|
ae2.version=rv2-beta-26
|
||||||
bc.version=7.0.9
|
bc.version=7.0.9
|
||||||
@ -18,13 +18,13 @@ coloredlights.build=35
|
|||||||
ec.cf=2242/839
|
ec.cf=2242/839
|
||||||
ec.version=deobf-1.7.10-2.2.73b129
|
ec.version=deobf-1.7.10-2.2.73b129
|
||||||
eio.cf=2219/296
|
eio.cf=2219/296
|
||||||
eio.version=1.7.10-2.2.1.276
|
eio.version=1.7.10-2.3.0.429_beta
|
||||||
es.version=1.4.5.24
|
es.version=1.4.5.24
|
||||||
fmp.version=1.1.0.308
|
fmp.version=1.1.0.308
|
||||||
forestry.version=4.1.0.44
|
forestry.version=4.1.0.44
|
||||||
gc.build=3
|
gc.build=3
|
||||||
gc.version=3.0.7
|
gc.version=3.0.7
|
||||||
gt.version=5.04.06
|
gt.version=5.09.33.52
|
||||||
ic2.version=2.2.828-experimental
|
ic2.version=2.2.828-experimental
|
||||||
igwmod.version=1.1.3-18
|
igwmod.version=1.1.3-18
|
||||||
mekanism.build=5
|
mekanism.build=5
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package li.cil.oc.integration.enderio
|
package li.cil.oc.integration.enderio
|
||||||
|
|
||||||
import crazypants.enderio.tool.ITool
|
import crazypants.enderio.api.tool.ITool
|
||||||
import net.minecraft.entity.player.EntityPlayer
|
import net.minecraft.entity.player.EntityPlayer
|
||||||
import net.minecraft.item.ItemStack
|
import net.minecraft.item.ItemStack
|
||||||
|
|
||||||
|
@ -18,6 +18,7 @@ import li.cil.tis3d.api.serial.SerialInterface
|
|||||||
import li.cil.tis3d.api.serial.SerialInterfaceProvider
|
import li.cil.tis3d.api.serial.SerialInterfaceProvider
|
||||||
import li.cil.tis3d.api.serial.SerialProtocolDocumentationReference
|
import li.cil.tis3d.api.serial.SerialProtocolDocumentationReference
|
||||||
import net.minecraft.nbt.NBTTagCompound
|
import net.minecraft.nbt.NBTTagCompound
|
||||||
|
import net.minecraft.tileentity.TileEntity
|
||||||
import net.minecraft.util.EnumFacing
|
import net.minecraft.util.EnumFacing
|
||||||
import net.minecraft.world.World
|
import net.minecraft.world.World
|
||||||
|
|
||||||
@ -36,7 +37,7 @@ object SerialInterfaceProviderAdapter extends SerialInterfaceProvider {
|
|||||||
override def interfaceFor(world: World, x: Int, y: Int, z: Int, side: EnumFacing): SerialInterface = new SerialInterfaceAdapter(world.getTileEntity(x, y, z).asInstanceOf[Adapter])
|
override def interfaceFor(world: World, x: Int, y: Int, z: Int, side: EnumFacing): SerialInterface = new SerialInterfaceAdapter(world.getTileEntity(x, y, z).asInstanceOf[Adapter])
|
||||||
|
|
||||||
override def isValid(world: World, x: Int, y: Int, z: Int, side: EnumFacing, serialInterface: SerialInterface): Boolean = serialInterface match {
|
override def isValid(world: World, x: Int, y: Int, z: Int, side: EnumFacing, serialInterface: SerialInterface): Boolean = serialInterface match {
|
||||||
case adapter: SerialInterfaceAdapter => adapter.tileEntity == world.getTileEntity(x, y, z)
|
case adapter: SerialInterfaceAdapter => adapter.tileEntity.asInstanceOf[TileEntity] == world.getTileEntity(x, y, z)
|
||||||
case _ => false
|
case _ => false
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -48,7 +49,7 @@ object SerialInterfaceProviderAdapter extends SerialInterfaceProvider {
|
|||||||
|
|
||||||
// ----------------------------------------------------------------------- //
|
// ----------------------------------------------------------------------- //
|
||||||
|
|
||||||
val node = api.Network.newNode(this, Visibility.Network).withComponent("serial_port").create()
|
val node: Node = api.Network.newNode(this, Visibility.Network).withComponent("serial_port").create()
|
||||||
|
|
||||||
override def onMessage(message: Message): Unit = {}
|
override def onMessage(message: Message): Unit = {}
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ import li.cil.oc.api.machine.Context
|
|||||||
import li.cil.oc.api.network.Message
|
import li.cil.oc.api.network.Message
|
||||||
import li.cil.oc.api.network.Visibility
|
import li.cil.oc.api.network.Visibility
|
||||||
import li.cil.oc.api.prefab
|
import li.cil.oc.api.prefab
|
||||||
import li.cil.oc.common.tileentity.{Robot => EntityRobot, Microcontroller}
|
import li.cil.oc.common.tileentity.{Microcontroller, Robot => EntityRobot}
|
||||||
import li.cil.oc.common.entity.{Drone => EntityDrone}
|
import li.cil.oc.common.entity.{Drone => EntityDrone}
|
||||||
import li.cil.oc.common.item.TabletWrapper
|
import li.cil.oc.common.item.TabletWrapper
|
||||||
import li.cil.oc.util.BlockPosition
|
import li.cil.oc.util.BlockPosition
|
||||||
@ -30,6 +30,7 @@ import net.minecraft.item.Item
|
|||||||
import net.minecraft.item.ItemStack
|
import net.minecraft.item.ItemStack
|
||||||
import net.minecraft.nbt.NBTTagCompound
|
import net.minecraft.nbt.NBTTagCompound
|
||||||
import net.minecraft.world.biome.BiomeGenDesert
|
import net.minecraft.world.biome.BiomeGenDesert
|
||||||
|
import net.minecraft.world.chunk.Chunk
|
||||||
import net.minecraftforge.common.MinecraftForge
|
import net.minecraftforge.common.MinecraftForge
|
||||||
import net.minecraftforge.common.util.ForgeDirection
|
import net.minecraftforge.common.util.ForgeDirection
|
||||||
|
|
||||||
@ -183,6 +184,12 @@ class Geolyzer(val host: EnvironmentHost) extends prefab.ManagedEnvironment with
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@Callback(doc = """function():table -- Returns GregTech underground fluids information""")
|
||||||
|
def scanUndergroundFluids(computer: Context, args: Arguments): Array[AnyRef] = {
|
||||||
|
val blockPos = BlockPosition(host)
|
||||||
|
val fluid = gregtech.common.GT_UndergroundOil.undergroundOilReadInformation(new Chunk(host.world, blockPos.x>>4, blockPos.z>>4))
|
||||||
|
result(Map("type" -> fluid.getLocalizedName, "quantity" -> fluid.amount))
|
||||||
|
}
|
||||||
|
|
||||||
override def onMessage(message: Message): Unit = {
|
override def onMessage(message: Message): Unit = {
|
||||||
super.onMessage(message)
|
super.onMessage(message)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user